From 6c782a53148dc2f34be2eafbdf872ab6497632fd Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Mon, 15 Mar 2021 10:11:48 +0100 Subject: Power up goto_implementation by allowing it to be invoked on references of names, showing all (trait) implementations of the given type in all crates including builtin types --- crates/ide/src/goto_implementation.rs | 130 +++++++++++++++++++++------------- crates/ide/src/inlay_hints.rs | 2 +- 2 files changed, 83 insertions(+), 49 deletions(-) (limited to 'crates/ide') diff --git a/crates/ide/src/goto_implementation.rs b/crates/ide/src/goto_implementation.rs index 3990305fc..f4d7c14a6 100644 --- a/crates/ide/src/goto_implementation.rs +++ b/crates/ide/src/goto_implementation.rs @@ -1,6 +1,9 @@ -use hir::{Crate, Impl, Semantics}; -use ide_db::RootDatabase; -use syntax::{algo::find_node_at_offset, ast, AstNode}; +use hir::{Impl, Semantics}; +use ide_db::{ + defs::{Definition, NameClass, NameRefClass}, + RootDatabase, +}; +use syntax::{ast, AstNode}; use crate::{display::TryToNav, FilePosition, NavigationTarget, RangeInfo}; @@ -21,55 +24,42 @@ pub(crate) fn goto_implementation( let source_file = sema.parse(position.file_id); let syntax = source_file.syntax().clone(); - let krate = sema.to_module_def(position.file_id)?.krate(); - - if let Some(nominal_def) = find_node_at_offset::(&syntax, position.offset) { - return Some(RangeInfo::new( - nominal_def.syntax().text_range(), - impls_for_def(&sema, &nominal_def, krate)?, - )); - } else if let Some(trait_def) = find_node_at_offset::(&syntax, position.offset) { - return Some(RangeInfo::new( - trait_def.syntax().text_range(), - impls_for_trait(&sema, &trait_def, krate)?, - )); - } - - None -} - -fn impls_for_def( - sema: &Semantics, - node: &ast::Adt, - krate: Crate, -) -> Option> { - let ty = match node { - ast::Adt::Struct(def) => sema.to_def(def)?.ty(sema.db), - ast::Adt::Enum(def) => sema.to_def(def)?.ty(sema.db), - ast::Adt::Union(def) => sema.to_def(def)?.ty(sema.db), + let node = sema.find_node_at_offset_with_descend(&syntax, position.offset)?; + let def = match &node { + ast::NameLike::Name(name) => { + NameClass::classify(&sema, name).map(|class| class.referenced_or_defined(sema.db)) + } + ast::NameLike::NameRef(name_ref) => { + NameRefClass::classify(&sema, name_ref).map(|class| class.referenced(sema.db)) + } + ast::NameLike::Lifetime(_) => None, + }?; + let def = match def { + Definition::ModuleDef(def) => def, + _ => return None, }; - - let impls = Impl::all_in_crate(sema.db, krate); - - Some( - impls - .into_iter() - .filter(|impl_def| ty.is_equal_for_find_impls(&impl_def.target_ty(sema.db))) - .filter_map(|imp| imp.try_to_nav(sema.db)) - .collect(), - ) + let navs = match def { + hir::ModuleDef::Trait(trait_) => impls_for_trait(&sema, trait_), + hir::ModuleDef::Adt(adt) => impls_for_ty(&sema, adt.ty(sema.db)), + hir::ModuleDef::TypeAlias(alias) => impls_for_ty(&sema, alias.ty(sema.db)), + hir::ModuleDef::BuiltinType(builtin) => { + let module = sema.to_module_def(position.file_id)?; + impls_for_ty(&sema, builtin.ty(sema.db, module)) + } + _ => return None, + }; + Some(RangeInfo { range: node.syntax().text_range(), info: navs }) } -fn impls_for_trait( - sema: &Semantics, - node: &ast::Trait, - krate: Crate, -) -> Option> { - let tr = sema.to_def(node)?; - - let impls = Impl::for_trait(sema.db, krate, tr); +fn impls_for_ty(sema: &Semantics, ty: hir::Type) -> Vec { + Impl::all_for_type(sema.db, ty).into_iter().filter_map(|imp| imp.try_to_nav(sema.db)).collect() +} - Some(impls.into_iter().filter_map(|imp| imp.try_to_nav(sema.db)).collect()) +fn impls_for_trait(sema: &Semantics, trait_: hir::Trait) -> Vec { + Impl::all_for_trait(sema.db, trait_) + .into_iter() + .filter_map(|imp| imp.try_to_nav(sema.db)) + .collect() } #[cfg(test)] @@ -223,6 +213,50 @@ mod marker { } #[rustc_builtin_macro] macro Copy {} +"#, + ); + } + + #[test] + fn goto_implementation_type_alias() { + check( + r#" +struct Foo; + +type Bar$0 = Foo; + +impl Foo {} + //^^^ +impl Bar {} + //^^^ +"#, + ); + } + + #[test] + fn goto_implementation_adt_generic() { + check( + r#" +struct Foo$0; + +impl Foo {} + //^^^^^^ +impl Foo {} + //^^^^^^^^ +"#, + ); + } + + #[test] + fn goto_implementation_builtin() { + check( + r#" +//- /lib.rs crate:main deps:core +fn foo(_: bool$0) {{}} +//- /libcore.rs crate:core +#[lang = "bool"] +impl bool {} + //^^^^ "#, ); } diff --git a/crates/ide/src/inlay_hints.rs b/crates/ide/src/inlay_hints.rs index 4ceb20742..16c04eeee 100644 --- a/crates/ide/src/inlay_hints.rs +++ b/crates/ide/src/inlay_hints.rs @@ -219,7 +219,7 @@ fn hint_iterator( let strukt = std::iter::successors(Some(ty.clone()), |ty| ty.remove_ref()) .last() .and_then(|strukt| strukt.as_adt())?; - let krate = strukt.krate(db)?; + let krate = strukt.krate(db); if krate != famous_defs.core()? { return None; } -- cgit v1.2.3