2 files changed, 35 insertions, 9 deletions

diff --git a/crates/ra_lsp_server/src/conv.rs b/crates/ra_lsp_server/src/conv.rs
index 35c679a4a..76fa98cbe 100644
--- a/crates/ra_lsp_server/src/conv.rs
+++ b/crates/ra_lsp_server/src/conv.rs
@@ -1,12 +1,12 @@
 use languageserver_types::{
-    self, CreateFile, DocumentChangeOperation, DocumentChanges, InsertTextFormat, Location,
+    self, CreateFile, DocumentChangeOperation, DocumentChanges, InsertTextFormat, Location, LocationLink,
     Position, Range, RenameFile, ResourceOp, SymbolKind, TextDocumentEdit, TextDocumentIdentifier,
     TextDocumentItem, TextDocumentPositionParams, Url, VersionedTextDocumentIdentifier,
     WorkspaceEdit,
 };
 use ra_ide_api::{
     CompletionItem, CompletionItemKind, FileId, FilePosition, FileRange, FileSystemEdit,
-    InsertText, NavigationTarget, SourceChange, SourceFileEdit,
+    InsertText, NavigationTarget, SourceChange, SourceFileEdit, RangeInfo,
     LineCol, LineIndex, translate_offset_with_edit
 };
 use ra_syntax::{SyntaxKind, TextRange, TextUnit};
@@ -345,10 +345,32 @@ impl TryConvWith for &NavigationTarget {
     type Output = Location;
     fn try_conv_with(self, world: &ServerWorld) -> Result<Location> {
         let line_index = world.analysis().file_line_index(self.file_id());
-        to_location(self.file_id(), self.range(), &world, &line_index)
+        let range = self.focus_range().unwrap_or(self.full_range());
+        to_location(self.file_id(), range, &world, &line_index)
     }
 }
 
+pub fn to_location_link(
+    target: &RangeInfo<NavigationTarget>,
+    world: &ServerWorld,
+    // line index for original range file
+    line_index: &LineIndex,
+) -> Result<LocationLink> {
+    let url = target.info.file_id().try_conv_with(world)?;
+    let tgt_line_index = world.analysis().file_line_index(target.info.file_id());
+
+    let res = LocationLink {
+        origin_selection_range: Some(target.range.conv_with(line_index)),
+        target_uri: url.to_string(),
+        target_range: target.info.full_range().conv_with(&tgt_line_index),
+        target_selection_range: target
+            .info
+            .focus_range()
+            .map(|it| it.conv_with(&tgt_line_index)),
+    };
+    Ok(res)
+}
+
 pub fn to_location(
     file_id: FileId,
     range: TextRange,
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index 5f4b27149..aad9d6568 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -9,7 +9,7 @@ use languageserver_types::{
     SignatureInformation, SymbolInformation, TextDocumentIdentifier, TextEdit, WorkspaceEdit,
 };
 use ra_ide_api::{
-    FileId, FilePosition, FileRange, FoldKind, Query, RunnableKind, Severity,
+    FileId, FilePosition, FileRange, FoldKind, Query, RunnableKind, Severity, RangeInfo,
 };
 use ra_syntax::{TextUnit, AstNode};
 use rustc_hash::FxHashMap;
@@ -17,7 +17,7 @@ use serde_json::to_value;
 use std::io::Write;
 
 use crate::{
-    conv::{to_location, Conv, ConvWith, MapConvWith, TryConvWith},
+    conv::{to_location, to_location_link, Conv, ConvWith, MapConvWith, TryConvWith},
     project_model::TargetKind,
     req::{self, Decoration},
     server_world::ServerWorld,
@@ -208,15 +208,19 @@ pub fn handle_goto_definition(
     params: req::TextDocumentPositionParams,
 ) -> Result<Option<req::GotoDefinitionResponse>> {
     let position = params.try_conv_with(&world)?;
-    let navs = match world.analysis().goto_definition(position)? {
+    let line_index = world.analysis().file_line_index(position.file_id);
+    let nav_info = match world.analysis().goto_definition(position)? {
         None => return Ok(None),
         Some(it) => it,
     };
-    let res = navs
+    let nav_range = nav_info.range;
+    let res = nav_info
+        .info
         .into_iter()
-        .map(|nav| nav.try_conv_with(&world))
+        .map(|nav| RangeInfo::new(nav_range, nav))
+        .map(|nav| to_location_link(&nav, &world, &line_index))
         .collect::<Result<Vec<_>>>()?;
-    Ok(Some(req::GotoDefinitionResponse::Array(res)))
+    Ok(Some(req::GotoDefinitionResponse::Link(res)))
 }
 
 pub fn handle_parent_module(