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 +++++++++++++++++++------- crates/ide/src/references/rename.rs | 3 ++- crates/ide_db/src/defs.rs | 2 +- crates/ide_db/src/search.rs | 16 +++++++++++++++- crates/rust-analyzer/src/handlers.rs | 20 +++++++++----------- 5 files changed, 46 insertions(+), 21 deletions(-) (limited to 'crates') 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 + "#]], + ); + } } diff --git a/crates/ide/src/references/rename.rs b/crates/ide/src/references/rename.rs index 1e378279d..5340b638a 100644 --- a/crates/ide/src/references/rename.rs +++ b/crates/ide/src/references/rename.rs @@ -510,7 +510,8 @@ fn source_edit_from_def( def: Definition, new_name: &str, ) -> RenameResult<(FileId, TextEdit)> { - let nav = def.try_to_nav(sema.db).unwrap(); + let nav = + def.try_to_nav(sema.db).ok_or_else(|| format_err!("No references found at position"))?; let mut replacement_text = String::new(); let mut repl_range = nav.focus_or_full_range(); diff --git a/crates/ide_db/src/defs.rs b/crates/ide_db/src/defs.rs index ff612b7d0..f86e5ce93 100644 --- a/crates/ide_db/src/defs.rs +++ b/crates/ide_db/src/defs.rs @@ -70,7 +70,7 @@ impl Definition { hir::ModuleDef::Static(it) => it.name(db)?, hir::ModuleDef::Trait(it) => it.name(db), hir::ModuleDef::TypeAlias(it) => it.name(db), - hir::ModuleDef::BuiltinType(_) => return None, + hir::ModuleDef::BuiltinType(it) => it.name(), }, Definition::SelfType(_) => return None, Definition::Local(it) => it.name(db)?, diff --git a/crates/ide_db/src/search.rs b/crates/ide_db/src/search.rs index ddcfbd3f3..1615d407e 100644 --- a/crates/ide_db/src/search.rs +++ b/crates/ide_db/src/search.rs @@ -6,7 +6,7 @@ use std::{convert::TryInto, mem}; -use base_db::{FileId, FileRange, SourceDatabaseExt}; +use base_db::{FileId, FileRange, SourceDatabase, SourceDatabaseExt}; use hir::{DefWithBody, HasSource, Module, ModuleSource, Semantics, Visibility}; use once_cell::unsync::Lazy; use rustc_hash::FxHashMap; @@ -134,6 +134,20 @@ impl IntoIterator for SearchScope { impl Definition { fn search_scope(&self, db: &RootDatabase) -> SearchScope { let _p = profile::span("search_scope"); + + if let Definition::ModuleDef(hir::ModuleDef::BuiltinType(_)) = self { + let mut res = FxHashMap::default(); + + let graph = db.crate_graph(); + for krate in graph.iter() { + let root_file = graph[krate].root_file_id; + let source_root_id = db.file_source_root(root_file); + let source_root = db.source_root(source_root_id); + res.extend(source_root.iter().map(|id| (id, None))); + } + return SearchScope::new(res); + } + let module = match self.module(db) { Some(it) => it, None => return SearchScope::empty(), 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); -- cgit v1.2.3