summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNayeem Rahman <nayeemrmn99@gmail.com>2023-09-24 08:18:51 +0100
committerGitHub <noreply@github.com>2023-09-24 08:18:51 +0100
commitd955d66a3f8c82a2286739cbb2d2ec657119163f (patch)
tree37154af2f005dae334a79559d5a6848bc9dcc112
parentb5ba5f157ed880568d5154e8443073dcf80098f8 (diff)
fix(lsp): show related information for tsc diagnostics (#20654)
-rw-r--r--cli/lsp/diagnostics.rs6
-rw-r--r--cli/tests/integration/lsp_tests.rs19
2 files changed, 21 insertions, 4 deletions
diff --git a/cli/lsp/diagnostics.rs b/cli/lsp/diagnostics.rs
index a04f490f7..fb998f880 100644
--- a/cli/lsp/diagnostics.rs
+++ b/cli/lsp/diagnostics.rs
@@ -646,10 +646,10 @@ fn to_lsp_related_information(
related
.iter()
.filter_map(|ri| {
- if let (Some(source), Some(start), Some(end)) =
- (&ri.source, &ri.start, &ri.end)
+ if let (Some(file_name), Some(start), Some(end)) =
+ (&ri.file_name, &ri.start, &ri.end)
{
- let uri = lsp::Url::parse(source).unwrap();
+ let uri = lsp::Url::parse(file_name).unwrap();
Some(lsp::DiagnosticRelatedInformation {
location: lsp::Location {
uri,
diff --git a/cli/tests/integration/lsp_tests.rs b/cli/tests/integration/lsp_tests.rs
index 4bc4713c6..567af5399 100644
--- a/cli/tests/integration/lsp_tests.rs
+++ b/cli/tests/integration/lsp_tests.rs
@@ -7351,7 +7351,24 @@ fn lsp_diagnostics_deprecated() {
"code": 6385,
"source": "deno-ts",
"message": "'a' is deprecated.",
- "relatedInformation": [],
+ "relatedInformation": [
+ {
+ "location": {
+ "uri": "file:///a/file.ts",
+ "range": {
+ "start": {
+ "line": 0,
+ "character": 4,
+ },
+ "end": {
+ "line": 0,
+ "character": 16,
+ },
+ },
+ },
+ "message": "The declaration was marked as deprecated here.",
+ },
+ ],
"tags": [2]
}
],