Enable searching for builtin types

1 files changed, 9 insertions, 11 deletions

diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs
index 6cc433cb8..9bb82164d 100644
--- a/crates/rust-analyzer/src/handlers.rs
+++ b/crates/rust-analyzer/src/handlers.rs
@@ -828,9 +828,9 @@ pub(crate) fn handle_references(
     };
 
     let decl = if params.context.include_declaration {
-        Some(FileRange {
-            file_id: refs.declaration.nav.file_id,
-            range: refs.declaration.nav.focus_or_full_range(),
+        refs.declaration.map(|decl| FileRange {
+            file_id: decl.nav.file_id,
+            range: decl.nav.focus_or_full_range(),
         })
     } else {
         None
@@ -1135,14 +1135,12 @@ pub(crate) fn handle_document_highlight(
         Some(refs) => refs,
     };
 
-    let decl = if refs.declaration.nav.file_id == position.file_id {
-        Some(DocumentHighlight {
-            range: to_proto::range(&line_index, refs.declaration.nav.focus_or_full_range()),
-            kind: refs.declaration.access.map(to_proto::document_highlight_kind),
-        })
-    } else {
-        None
-    };
+    let decl = refs.declaration.filter(|decl| decl.nav.file_id == position.file_id).map(|decl| {
+        DocumentHighlight {
+            range: to_proto::range(&line_index, decl.nav.focus_or_full_range()),
+            kind: decl.access.map(to_proto::document_highlight_kind),
+        }
+    });
 
     let file_refs = refs.references.get(&position.file_id).map_or(&[][..], Vec::as_slice);
     let mut res = Vec::with_capacity(file_refs.len() + 1);