aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-02-05 07:36:51 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-02-05 07:36:51 +0000
commit94d5d0d7e893a50bdd22ce4366ca15f083218d22 (patch)
treef771ec02dd6a0bcd1243abfd59e5cf294dee7ff0 /crates
parentd914ac0069d3382f08a1ebdc3481ed7fc7a74b48 (diff)
parent7f92fd858ac41e441b814f0a94609b478301ab82 (diff)
Merge #743
743: Move comment r=matklad a=kjeremy As pointed out in https://github.com/rust-analyzer/rust-analyzer/pull/738/files#r253651450 Co-authored-by: kjeremy <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_lsp_server/src/main_loop/handlers.rs25
1 files changed, 13 insertions, 12 deletions
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index c25adb8b9..4720a8843 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -599,9 +599,6 @@ pub fn handle_code_action(
599 let title = source_edit.label.clone(); 599 let title = source_edit.label.clone();
600 let edit = source_edit.try_conv_with(&world)?; 600 let edit = source_edit.try_conv_with(&world)?;
601 601
602 // We cannot use the 'editor.action.showReferences' command directly
603 // because that command requires vscode types which we convert in the handler
604 // on the client side.
605 let cmd = Command { 602 let cmd = Command {
606 title, 603 title,
607 command: "rust-analyzer.applySourceChange".to_string(), 604 command: "rust-analyzer.applySourceChange".to_string(),
@@ -713,17 +710,21 @@ pub fn handle_code_lens_resolve(world: ServerWorld, code_lens: CodeLens) -> Resu
713 format!("{} implementations", locations.len()) 710 format!("{} implementations", locations.len())
714 }; 711 };
715 712
713 // We cannot use the 'editor.action.showReferences' command directly
714 // because that command requires vscode types which we convert in the handler
715 // on the client side.
716 let cmd = Command {
717 title,
718 command: "rust-analyzer.showReferences".into(),
719 arguments: Some(vec![
720 to_value(&Ser::new(&lens_params.text_document.uri)).unwrap(),
721 to_value(code_lens.range.start).unwrap(),
722 to_value(locations).unwrap(),
723 ]),
724 };
716 return Ok(CodeLens { 725 return Ok(CodeLens {
717 range: code_lens.range, 726 range: code_lens.range,
718 command: Some(Command { 727 command: Some(cmd),
719 title,
720 command: "rust-analyzer.showReferences".into(),
721 arguments: Some(vec![
722 to_value(&Ser::new(&lens_params.text_document.uri)).unwrap(),
723 to_value(code_lens.range.start).unwrap(),
724 to_value(locations).unwrap(),
725 ]),
726 }),
727 data: None, 728 data: None,
728 }); 729 });
729 } 730 }