1 files changed, 23 insertions, 3 deletions

diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index 3b7a14a5c..012f74270 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -6,9 +6,8 @@ use languageserver_types::{
     DiagnosticSeverity, DocumentSymbol, Documentation, FoldingRange, FoldingRangeKind,
     FoldingRangeParams, Location, MarkupContent, MarkupKind, MarkedString, Position,
     PrepareRenameResponse, RenameParams, SymbolInformation, TextDocumentIdentifier, TextEdit,
-    Range,
-    WorkspaceEdit, ParameterInformation, ParameterLabel, SignatureInformation, Hover, HoverContents,
-    DocumentFormattingParams,
+    Range, WorkspaceEdit, ParameterInformation, ParameterLabel, SignatureInformation, Hover,
+    HoverContents, DocumentFormattingParams, DocumentHighlight,
 };
 use ra_analysis::{FileId, FoldKind, Query, RunnableKind, FileRange, FilePosition, Severity};
 use ra_syntax::{TextUnit, text_utils::intersect};
@@ -668,6 +667,27 @@ pub fn handle_code_action(
     Ok(Some(CodeActionResponse::Commands(res)))
 }
 
+pub fn handle_document_highlight(
+    world: ServerWorld,
+    params: req::TextDocumentPositionParams,
+) -> Result<Option<Vec<DocumentHighlight>>> {
+    let file_id = params.text_document.try_conv_with(&world)?;
+    let line_index = world.analysis().file_line_index(file_id);
+
+    let refs = world
+        .analysis()
+        .find_all_refs(params.try_conv_with(&world)?)?;
+
+    Ok(Some(
+        refs.into_iter()
+            .map(|r| DocumentHighlight {
+                range: r.1.conv_with(&line_index),
+                kind: None,
+            })
+            .collect(),
+    ))
+}
+
 pub fn publish_diagnostics(
     world: &ServerWorld,
     file_id: FileId,