summaryrefslogtreecommitdiff
path: root/cli/tests/integration/lsp_tests.rs
diff options
context:
space:
mode:
Diffstat (limited to 'cli/tests/integration/lsp_tests.rs')
-rw-r--r--cli/tests/integration/lsp_tests.rs20
1 files changed, 10 insertions, 10 deletions
diff --git a/cli/tests/integration/lsp_tests.rs b/cli/tests/integration/lsp_tests.rs
index 518dfe850..f0cb6d4b8 100644
--- a/cli/tests/integration/lsp_tests.rs
+++ b/cli/tests/integration/lsp_tests.rs
@@ -12,17 +12,17 @@ use tempfile::TempDir;
use test_util::deno_exe_path;
use test_util::http_server;
use test_util::lsp::LspClient;
-use test_util::root_path;
+use test_util::testdata_path;
fn load_fixture(path: &str) -> Value {
- let fixtures_path = root_path().join("cli/tests/lsp");
+ let fixtures_path = testdata_path().join("lsp");
let path = fixtures_path.join(path);
let fixture_str = fs::read_to_string(path).unwrap();
serde_json::from_str(&fixture_str).unwrap()
}
fn load_fixture_str(path: &str) -> String {
- let fixtures_path = root_path().join("cli/tests/lsp");
+ let fixtures_path = testdata_path().join("lsp");
let path = fixtures_path.join(path);
fs::read_to_string(path).unwrap()
}
@@ -921,7 +921,7 @@ fn lsp_hover_dependency() {
Some(json!({
"contents": {
"kind": "markdown",
- "value": "**Resolved Dependency**\n\n**Code**: http​://127.0.0.1:4545/cli/tests/subdir/type_reference.js\n"
+ "value": "**Resolved Dependency**\n\n**Code**: http​://127.0.0.1:4545/subdir/type_reference.js\n"
},
"range": {
"start": {
@@ -930,7 +930,7 @@ fn lsp_hover_dependency() {
},
"end":{
"line": 3,
- "character": 76
+ "character": 66
}
}
}))
@@ -955,7 +955,7 @@ fn lsp_hover_dependency() {
Some(json!({
"contents": {
"kind": "markdown",
- "value": "**Resolved Dependency**\n\n**Code**: http​://127.0.0.1:4545/cli/tests/subdir/mod1.ts\n"
+ "value": "**Resolved Dependency**\n\n**Code**: http​://127.0.0.1:4545/subdir/mod1.ts\n"
},
"range": {
"start": {
@@ -964,7 +964,7 @@ fn lsp_hover_dependency() {
},
"end":{
"line": 4,
- "character": 66
+ "character": 56
}
}
}))
@@ -2713,7 +2713,7 @@ fn lsp_diagnostics_warn() {
"uri": "file:///a/file.ts",
"languageId": "typescript",
"version": 1,
- "text": "import * as a from \"http://127.0.0.1:4545/cli/tests/x_deno_warning.js\";\n\nconsole.log(a)\n",
+ "text": "import * as a from \"http://127.0.0.1:4545/x_deno_warning.js\";\n\nconsole.log(a)\n",
},
}),
);
@@ -2726,7 +2726,7 @@ fn lsp_diagnostics_warn() {
},
"uris": [
{
- "uri": "http://127.0.0.1:4545/cli/tests/x_deno_warning.js",
+ "uri": "http://127.0.0.1:4545/x_deno_warning.js",
}
],
}),
@@ -2755,7 +2755,7 @@ fn lsp_diagnostics_warn() {
},
end: lsp::Position {
line: 0,
- character: 70
+ character: 60
}
},
severity: Some(lsp::DiagnosticSeverity::Warning),