From 9763d9e8c4ca01a4df0d70877020ec7351403b75 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Mon, 15 Mar 2021 09:32:06 +0100 Subject: Enable searching for builtin types --- crates/ide/src/references.rs | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'crates/ide/src/references.rs') diff --git a/crates/ide/src/references.rs b/crates/ide/src/references.rs index fef70533d..ec7c7686d 100644 --- a/crates/ide/src/references.rs +++ b/crates/ide/src/references.rs @@ -29,7 +29,7 @@ use crate::{display::TryToNav, FilePosition, NavigationTarget}; #[derive(Debug, Clone)] pub struct ReferenceSearchResult { - pub declaration: Declaration, + pub declaration: Option, pub references: FxHashMap)>>, } @@ -91,10 +91,10 @@ pub(crate) fn find_all_refs( _ => {} } } - let nav = def.try_to_nav(sema.db)?; - let decl_range = nav.focus_or_full_range(); - - let declaration = Declaration { nav, access: decl_access(&def, &syntax, decl_range) }; + let declaration = def.try_to_nav(sema.db).map(|nav| { + let decl_range = nav.focus_or_full_range(); + Declaration { nav, access: decl_access(&def, &syntax, decl_range) } + }); let references = usages .into_iter() .map(|(file_id, refs)| { @@ -1004,8 +1004,7 @@ impl Foo { let refs = analysis.find_all_refs(pos, search_scope).unwrap().unwrap(); let mut actual = String::new(); - { - let decl = refs.declaration; + if let Some(decl) = refs.declaration { format_to!(actual, "{}", decl.nav.debug_render()); if let Some(access) = decl.access { format_to!(actual, " {:?}", access) @@ -1258,4 +1257,17 @@ fn main() { "#]], ); } + + #[test] + fn test_primitives() { + check( + r#" +fn foo(_: bool) -> bo$0ol { true } +"#, + expect![[r#" + FileId(0) 10..14 + FileId(0) 19..23 + "#]], + ); + } } -- cgit v1.2.3