From 14f83da2210dce53b663581c22d39c98fac1d2f6 Mon Sep 17 00:00:00 2001 From: Kitson Kelly Date: Thu, 18 Nov 2021 13:05:20 +1100 Subject: [PATCH] fix(lsp): tag deprecated diagnostics properly (#12801) --- cli/lsp/diagnostics.rs | 7 ++-- cli/tests/integration/lsp_tests.rs | 58 ++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/cli/lsp/diagnostics.rs b/cli/lsp/diagnostics.rs index ddc18f18fc..4836cff997 100644 --- a/cli/lsp/diagnostics.rs +++ b/cli/lsp/diagnostics.rs @@ -285,9 +285,10 @@ fn ts_json_to_diagnostics( ), tags: match d.code { // These are codes that indicate the variable is unused. - 2695 | 6133 | 6138 | 6192 | 6196 | 6198 | 6199 | 7027 | 7028 => { - Some(vec![lsp::DiagnosticTag::Unnecessary]) - } + 2695 | 6133 | 6138 | 6192 | 6196 | 6198 | 6199 | 6205 | 7027 + | 7028 => Some(vec![lsp::DiagnosticTag::Unnecessary]), + // These are codes that indicated the variable is deprecated. + 2789 | 6385 | 6387 => Some(vec![lsp::DiagnosticTag::Deprecated]), _ => None, }, data: None, diff --git a/cli/tests/integration/lsp_tests.rs b/cli/tests/integration/lsp_tests.rs index bf92589254..c22bb3bdbf 100644 --- a/cli/tests/integration/lsp_tests.rs +++ b/cli/tests/integration/lsp_tests.rs @@ -3014,6 +3014,64 @@ fn lsp_diagnostics_warn() { shutdown(&mut client); } +#[test] +fn lsp_diagnostics_deprecated() { + let mut client = init("initialize_params.json"); + let diagnostics = did_open( + &mut client, + json!({ + "textDocument": { + "uri": "file:///a/file.ts", + "languageId": "typescript", + "version": 1, + "text": "/** @deprecated */\nexport const a = \"a\";\n\na;\n", + }, + }), + ); + assert_eq!( + json!(diagnostics), + json!([ + { + "uri": "file:///a/file.ts", + "diagnostics": [], + "version": 1 + }, + { + "uri": "file:///a/file.ts", + "diagnostics": [], + "version": 1 + }, + { + "uri": "file:///a/file.ts", + "diagnostics": [ + { + "range": { + "start": { + "line": 3, + "character": 0 + }, + "end": { + "line": 3, + "character": 1 + } + }, + "severity": 4, + "code": 6385, + "source": "deno-ts", + "message": "'a' is deprecated.", + "relatedInformation": [], + "tags": [ + 2 + ] + } + ], + "version": 1 + } + ]) + ); + shutdown(&mut client); +} + #[test] fn lsp_diagnostics_deno_types() { let mut client = init("initialize_params.json");