From 41f470fea84998af65292f3c297c3e2b1d897848 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Sat, 8 May 2021 22:34:55 +0200 Subject: Correctly support SelfType when searching for usages --- crates/ide_db/src/search.rs | 172 ++++++++++++++++++++++++++------------------ 1 file changed, 102 insertions(+), 70 deletions(-) (limited to 'crates/ide_db/src') diff --git a/crates/ide_db/src/search.rs b/crates/ide_db/src/search.rs index 8f899ea56..891b8cf0a 100644 --- a/crates/ide_db/src/search.rs +++ b/crates/ide_db/src/search.rs @@ -233,6 +233,13 @@ impl Definition { }; } + if let Definition::SelfType(impl_) = self { + return match impl_.source(db).map(|src| src.value.syntax().text_range()) { + Some(range) => SearchScope::file_range(FileRange { file_id, range }), + None => SearchScope::single_file(file_id), + }; + } + if let Definition::GenericParam(hir::GenericParam::LifetimeParam(param)) = self { let range = match param.parent(db) { hir::GenericDef::Function(it) => { @@ -297,7 +304,7 @@ impl Definition { } pub fn usages<'a>(&'a self, sema: &'a Semantics) -> FindUsages<'a> { - FindUsages { def: self, sema, scope: None, include_self_kw_refs: false } + FindUsages { def: self, sema, scope: None, include_self_kw_refs: None } } } @@ -305,12 +312,13 @@ pub struct FindUsages<'a> { def: &'a Definition, sema: &'a Semantics<'a, RootDatabase>, scope: Option, - include_self_kw_refs: bool, + include_self_kw_refs: Option, } impl<'a> FindUsages<'a> { - pub fn include_self_kw_refs(mut self, include: bool) -> FindUsages<'a> { - self.include_self_kw_refs = include; + /// Enable searching for `Self` when the definition is a type. + pub fn include_self_refs(mut self) -> FindUsages<'a> { + self.include_self_kw_refs = def_to_ty(self.sema.db, self.def); self } @@ -354,13 +362,18 @@ impl<'a> FindUsages<'a> { } }; - let name = match self.def.name(sema.db) { - Some(it) => it.to_string(), + let name = self.def.name(sema.db).or_else(|| { + self.include_self_kw_refs.as_ref().and_then(|ty| { + ty.as_adt() + .map(|adt| adt.name(self.sema.db)) + .or_else(|| ty.as_builtin().map(|builtin| builtin.name())) + }) + }); + let name = match name { + Some(name) => name.to_string(), None => return, }; - - let pat = name.as_str(); - let search_for_self = self.include_self_kw_refs; + let name = name.as_str(); for (file_id, search_range) in search_scope { let text = sema.db.file_text(file_id); @@ -369,51 +382,63 @@ impl<'a> FindUsages<'a> { let tree = Lazy::new(|| sema.parse(file_id).syntax().clone()); - let mut handle_match = |idx: usize| -> bool { + for (idx, _) in text.match_indices(name) { let offset: TextSize = idx.try_into().unwrap(); if !search_range.contains_inclusive(offset) { - return false; + continue; } if let Some(name) = sema.find_node_at_offset_with_descend(&tree, offset) { - match name { - ast::NameLike::NameRef(name_ref) => { - if self.found_name_ref(&name_ref, sink) { - return true; - } - } - ast::NameLike::Name(name) => { - if self.found_name(&name, sink) { - return true; - } - } - ast::NameLike::Lifetime(lifetime) => { - if self.found_lifetime(&lifetime, sink) { - return true; - } - } + if match name { + ast::NameLike::NameRef(name_ref) => self.found_name_ref(&name_ref, sink), + ast::NameLike::Name(name) => self.found_name(&name, sink), + ast::NameLike::Lifetime(lifetime) => self.found_lifetime(&lifetime, sink), + } { + return; } } - - return false; - }; - - for (idx, _) in text.match_indices(pat) { - if handle_match(idx) { - return; - } } - - if search_for_self { + if let Some(self_ty) = &self.include_self_kw_refs { for (idx, _) in text.match_indices("Self") { - if handle_match(idx) { - return; + let offset: TextSize = idx.try_into().unwrap(); + if !search_range.contains_inclusive(offset) { + continue; + } + + if let Some(ast::NameLike::NameRef(name_ref)) = + sema.find_node_at_offset_with_descend(&tree, offset) + { + if self.found_self_ty_name_ref(&self_ty, &name_ref, sink) { + return; + } } } } } } + fn found_self_ty_name_ref( + &self, + self_ty: &hir::Type, + name_ref: &ast::NameRef, + sink: &mut dyn FnMut(FileId, FileReference) -> bool, + ) -> bool { + match NameRefClass::classify(self.sema, &name_ref) { + Some(NameRefClass::Definition(Definition::SelfType(impl_))) + if impl_.self_ty(self.sema.db) == *self_ty => + { + let FileRange { file_id, range } = self.sema.original_range(name_ref.syntax()); + let reference = FileReference { + range, + name: ast::NameLike::NameRef(name_ref.clone()), + access: None, + }; + sink(file_id, reference) + } + _ => false, + } + } + fn found_lifetime( &self, lifetime: &ast::Lifetime, @@ -429,7 +454,7 @@ impl<'a> FindUsages<'a> { }; sink(file_id, reference) } - _ => false, // not a usage + _ => false, } } @@ -448,42 +473,35 @@ impl<'a> FindUsages<'a> { }; sink(file_id, reference) } - Some(NameRefClass::Definition(Definition::SelfType(impl_))) => { - let ty = impl_.self_ty(self.sema.db); - - if let Some(adt) = ty.as_adt() { - if &Definition::ModuleDef(ModuleDef::Adt(adt)) == self.def { - let FileRange { file_id, range } = - self.sema.original_range(name_ref.syntax()); - let reference = FileReference { - range, - name: ast::NameLike::NameRef(name_ref.clone()), - access: None, - }; - return sink(file_id, reference); - } + Some(NameRefClass::Definition(def)) if self.include_self_kw_refs.is_some() => { + if self.include_self_kw_refs == def_to_ty(self.sema.db, &def) { + let FileRange { file_id, range } = self.sema.original_range(name_ref.syntax()); + let reference = FileReference { + range, + name: ast::NameLike::NameRef(name_ref.clone()), + access: reference_access(&def, &name_ref), + }; + sink(file_id, reference) + } else { + false } - - false } Some(NameRefClass::FieldShorthand { local_ref: local, field_ref: field }) => { let FileRange { file_id, range } = self.sema.original_range(name_ref.syntax()); - let reference = match self.def { - Definition::Field(_) if &field == self.def => FileReference { - range, - name: ast::NameLike::NameRef(name_ref.clone()), - access: reference_access(&field, &name_ref), - }, - Definition::Local(l) if &local == l => FileReference { - range, - name: ast::NameLike::NameRef(name_ref.clone()), - access: reference_access(&Definition::Local(local), &name_ref), - }, - _ => return false, // not a usage + let access = match self.def { + Definition::Field(_) if &field == self.def => { + reference_access(&field, &name_ref) + } + Definition::Local(l) if &local == l => { + reference_access(&Definition::Local(local), &name_ref) + } + _ => return false, }; + let reference = + FileReference { range, name: ast::NameLike::NameRef(name_ref.clone()), access }; sink(file_id, reference) } - _ => false, // not a usage + _ => false, } } @@ -513,11 +531,25 @@ impl<'a> FindUsages<'a> { FileReference { range, name: ast::NameLike::Name(name.clone()), access: None }; sink(file_id, reference) } - _ => false, // not a usage + _ => false, } } } +fn def_to_ty(db: &RootDatabase, def: &Definition) -> Option { + match def { + Definition::ModuleDef(def) => match def { + ModuleDef::Adt(adt) => Some(adt.ty(db)), + ModuleDef::TypeAlias(it) => Some(it.ty(db)), + ModuleDef::BuiltinType(_it) => None, // FIXME somehow acquire some module to construct the builtin type + ModuleDef::Trait(_it) => None, // FIXME turn trait into its self-type + _ => None, + }, + Definition::SelfType(it) => Some(it.self_ty(db)), + _ => None, + } +} + fn reference_access(def: &Definition, name_ref: &ast::NameRef) -> Option { // Only Locals and Fields have accesses for now. if !matches!(def, Definition::Local(_) | Definition::Field(_)) { -- cgit v1.2.3 From 04717b9bd2decfee70a6fbde90540d3dc16bb76f Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Sat, 8 May 2021 22:43:26 +0200 Subject: Fix builtintype def_to_ty --- crates/ide_db/src/search.rs | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'crates/ide_db/src') diff --git a/crates/ide_db/src/search.rs b/crates/ide_db/src/search.rs index 891b8cf0a..d8abef491 100644 --- a/crates/ide_db/src/search.rs +++ b/crates/ide_db/src/search.rs @@ -318,7 +318,7 @@ pub struct FindUsages<'a> { impl<'a> FindUsages<'a> { /// Enable searching for `Self` when the definition is a type. pub fn include_self_refs(mut self) -> FindUsages<'a> { - self.include_self_kw_refs = def_to_ty(self.sema.db, self.def); + self.include_self_kw_refs = def_to_ty(self.sema, self.def); self } @@ -474,7 +474,7 @@ impl<'a> FindUsages<'a> { sink(file_id, reference) } Some(NameRefClass::Definition(def)) if self.include_self_kw_refs.is_some() => { - if self.include_self_kw_refs == def_to_ty(self.sema.db, &def) { + if self.include_self_kw_refs == def_to_ty(self.sema, &def) { let FileRange { file_id, range } = self.sema.original_range(name_ref.syntax()); let reference = FileReference { range, @@ -536,16 +536,22 @@ impl<'a> FindUsages<'a> { } } -fn def_to_ty(db: &RootDatabase, def: &Definition) -> Option { +fn def_to_ty(sema: &Semantics, def: &Definition) -> Option { match def { Definition::ModuleDef(def) => match def { - ModuleDef::Adt(adt) => Some(adt.ty(db)), - ModuleDef::TypeAlias(it) => Some(it.ty(db)), - ModuleDef::BuiltinType(_it) => None, // FIXME somehow acquire some module to construct the builtin type - ModuleDef::Trait(_it) => None, // FIXME turn trait into its self-type + ModuleDef::Adt(adt) => Some(adt.ty(sema.db)), + ModuleDef::TypeAlias(it) => Some(it.ty(sema.db)), + ModuleDef::BuiltinType(it) => { + let graph = sema.db.crate_graph(); + let krate = graph.iter().next()?; + let root_file = graph[krate].root_file_id; + let module = sema.to_module_def(root_file)?; + Some(it.ty(sema.db, module)) + } + ModuleDef::Trait(_it) => None, // FIXME turn trait into its self-type _ => None, }, - Definition::SelfType(it) => Some(it.self_ty(db)), + Definition::SelfType(it) => Some(it.self_ty(sema.db)), _ => None, } } -- cgit v1.2.3 From 3a346412cf8ce2f04e123195452bf1b1c86211a7 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Sat, 8 May 2021 23:30:19 +0200 Subject: Don't handle Self as a usage for TraitDefs --- crates/ide_db/src/search.rs | 1 - 1 file changed, 1 deletion(-) (limited to 'crates/ide_db/src') diff --git a/crates/ide_db/src/search.rs b/crates/ide_db/src/search.rs index d8abef491..67840602b 100644 --- a/crates/ide_db/src/search.rs +++ b/crates/ide_db/src/search.rs @@ -548,7 +548,6 @@ fn def_to_ty(sema: &Semantics, def: &Definition) -> Option None, // FIXME turn trait into its self-type _ => None, }, Definition::SelfType(it) => Some(it.self_ty(sema.db)), -- cgit v1.2.3