Add test and improve code

cli/lsp/code_lens.rs

@@ -297,19 +297,14 @@ async fn resolve_references_code_lens(
  data: CodeLensData,
  language_server: &language_server::Inner,
 ) -> Result<lsp::CodeLens, AnyError> {
- let asset_or_document =
- language_server.get_asset_or_document(&data.specifier)?;
- let line_index = asset_or_document.line_index();
- let snapshot = language_server.snapshot();
- let maybe_referenced_symbols = language_server
- .ts_server
- .find_references(
- snapshot,
- &data.specifier,
- line_index.offset_tsc(code_lens.range.start)?,
- )
- .await?;
- if let Some(symbols) = maybe_referenced_symbols {
+ fn get_locations(
+ maybe_referenced_symbols: Option<Vec<tsc::ReferencedSymbol>>,
+ language_server: &language_server::Inner,
+ ) -> Result<Vec<lsp::Location>, AnyError> {
+ let symbols = match maybe_referenced_symbols {
+ Some(symbols) => symbols,
+ None => return Ok(Vec::new()),
+ };
  let mut locations = Vec::new();
  for reference in symbols.iter().flat_map(|s| &s.references) {
  if reference.is_definition {
@@ -325,45 +320,49 @@ async fn resolve_references_code_lens(
  .to_location(asset_or_doc.line_index(), &language_server.url_map),
  );
  }
- let command = if !locations.is_empty() {
- let title = if locations.len() > 1 {
- format!("{} references", locations.len())
- } else {
- "1 reference".to_string()
- };
- lsp::Command {
- title,
- command: "deno.showReferences".to_string(),
- arguments: Some(vec![
- json!(data.specifier),
- json!(code_lens.range.start),
- json!(locations),
- ]),
- }
- } else {
- lsp::Command {
- title: "0 references".to_string(),
- command: "".to_string(),
- arguments: None,
- }
- };
- Ok(lsp::CodeLens {
- range: code_lens.range,
- command: Some(command),
- data: None,
- })
+ Ok(locations)
+ }
+
+ let asset_or_document =
+ language_server.get_asset_or_document(&data.specifier)?;
+ let line_index = asset_or_document.line_index();
+ let snapshot = language_server.snapshot();
+ let maybe_referenced_symbols = language_server
+ .ts_server
+ .find_references(
+ snapshot,
+ &data.specifier,
+ line_index.offset_tsc(code_lens.range.start)?,
+ )
+ .await?;
+ let locations = get_locations(maybe_referenced_symbols, language_server)?;
+ let title = if locations.len() == 1 {
+ "1 reference".to_string()
  } else {
- let command = lsp::Command {
- title: "0 references".to_string(),
- command: "".to_string(),
+ format!("{} references", locations.len())
+ };
+ let command = if locations.is_empty() {
+ lsp::Command {
+ title,
+ command: String::new(),
  arguments: None,
- };
- Ok(lsp::CodeLens {
- range: code_lens.range,
- command: Some(command),
- data: None,
- })
- }
+ }
+ } else {
+ lsp::Command {
+ title,
+ command: "deno.showReferences".to_string(),
+ arguments: Some(vec![
+ json!(data.specifier),
+ json!(code_lens.range.start),
+ json!(locations),
+ ]),
+ }
+ };
+ Ok(lsp::CodeLens {
+ range: code_lens.range,
+ command: Some(command),
+ data: None,
+ })
 }
 
 pub async fn resolve_code_lens(

cli/tests/integration/lsp_tests.rs

@@ -2367,16 +2367,32 @@ fn lsp_semantic_tokens() {
 fn lsp_code_lens() {
  let mut client = LspClientBuilder::new().build();
  client.initialize_default();
- client.did_open(
- json!({
- "textDocument": {
- "uri": "file:https:///a/file.ts",
- "languageId": "typescript",
- "version": 1,
- "text": "class A {\n a = \"a\";\n\n b() {\n console.log(this.a);\n }\n\n c() {\n this.a = \"c\";\n }\n}\n\nconst a = new A();\na.b();\n"
- }
- }),
- );
+ client.did_open(json!({
+ "textDocument": {
+ "uri": "file:https:///a/file.ts",
+ "languageId": "typescript",
+ "version": 1,
+ "text": concat!(
+ "class A {\n",
+ " a = \"a\";\n",
+ "\n",
+ " b() {\n",
+ " console.log(this.a);\n",
+ " }\n",
+ "\n",
+ " c() {\n",
+ " this.a = \"c\";\n",
+ " }\n",
+ "}\n",
+ "\n",
+ "const a = new A();\n",
+ "a.b();\n",
+ "const b = 2;\n",
+ "const c = 3;\n",
+ "c; c;",
+ ),
+ }
+ }));
  let res = client.write_request(
  "textDocument/codeLens",
  json!({
@@ -2444,6 +2460,80 @@ fn lsp_code_lens() {
  }
  })
  );
+
+ // 0 references
+ let res = client.write_request(
+ "codeLens/resolve",
+ json!({
+ "range": {
+ "start": { "line": 14, "character": 6 },
+ "end": { "line": 14, "character": 7 }
+ },
+ "data": {
+ "specifier": "file:https:///a/file.ts",
+ "source": "references"
+ }
+ }),
+ );
+ assert_eq!(
+ res,
+ json!({
+ "range": {
+ "start": { "line": 14, "character": 6 },
+ "end": { "line": 14, "character": 7 }
+ },
+ "command": {
+ "title": "0 references",
+ "command": "",
+ }
+ })
+ );
+
+ // 2 references
+ let res = client.write_request(
+ "codeLens/resolve",
+ json!({
+ "range": {
+ "start": { "line": 15, "character": 6 },
+ "end": { "line": 15, "character": 7 }
+ },
+ "data": {
+ "specifier": "file:https:///a/file.ts",
+ "source": "references"
+ }
+ }),
+ );
+ assert_eq!(
+ res,
+ json!({
+ "range": {
+ "start": { "line": 15, "character": 6 },
+ "end": { "line": 15, "character": 7 }
+ },
+ "command": {
+ "title": "2 references",
+ "command": "deno.showReferences",
+ "arguments": [
+ "file:https:///a/file.ts",
+ { "line": 15, "character": 6 },
+ [{
+ "uri": "file:https:///a/file.ts",
+ "range": {
+ "start": { "line": 16, "character": 0 },
+ "end": { "line": 16, "character": 1 }
+ }
+ },{
+ "uri": "file:https:///a/file.ts",
+ "range": {
+ "start": { "line": 16, "character": 3 },
+ "end": { "line": 16, "character": 4 }
+ }
+ }]
+ ]
+ }
+ })
+ );
+
  client.shutdown();
 }
 
@@ -3094,7 +3184,7 @@ fn lsp_find_references() {
  "uri": "file:https:///a/mod.ts",
  "languageId": "typescript",
  "version": 1,
- "text": r#"export const a = 5;"#
+ "text": r#"export const a = 1;\nexport const b = 2;"#
  }
  }));
  client.did_open(json!({
@@ -3174,6 +3264,22 @@ fn lsp_find_references() {
  }])
  );
 
+ // test 0 references
+ let res = client.write_request(
+ "textDocument/references",
+ json!({
+ "textDocument": {
+ "uri": "file:https:///a/mod.ts",
+ },
+ "position": { "line": 1, "character": 13 },
+ "context": {
+ "includeDeclaration": false
+ }
+ }),
+ );
+
+ assert_eq!(res, json!([]));
+
  client.shutdown();
 }