Merge #7941

7941: Fix unused definitions not being document highlit r=Veykril a=Veykril

Fixes #7939

bors r+

Co-authored-by: Lukas Wirth <[email protected]>

1 files changed, 7 insertions, 14 deletions

diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs
index 2c4c339cb..b5b2ffe50 100644
--- a/crates/rust-analyzer/src/handlers.rs
+++ b/crates/rust-analyzer/src/handlers.rs
@@ -1134,20 +1134,13 @@ pub(crate) fn handle_document_highlight(
         None
     };
 
-    let res = refs
-        .references
-        .get(&position.file_id)
-        .map(|file_refs| {
-            file_refs
-                .into_iter()
-                .map(|&(range, access)| DocumentHighlight {
-                    range: to_proto::range(&line_index, range),
-                    kind: access.map(to_proto::document_highlight_kind),
-                })
-                .chain(decl)
-                .collect()
-        })
-        .unwrap_or_default();
+    let file_refs = refs.references.get(&position.file_id).map_or(&[][..], Vec::as_slice);
+    let mut res = Vec::with_capacity(file_refs.len() + 1);
+    res.extend(decl);
+    res.extend(file_refs.iter().map(|&(range, access)| DocumentHighlight {
+        range: to_proto::range(&line_index, range),
+        kind: access.map(to_proto::document_highlight_kind),
+    }));
     Ok(Some(res))
 }