mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Type::walk for goto_type_definition

Browse Source
This commit is contained in:
Lukas Wirth 2021-07-14 01:42:30 +02:00
parent 9bd6836513
commit 12fe48c04d
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
crates/ide/src/goto_type_definition.rs
View File

@ -1,5 +1,4 @@
use ide_db::{base_db::Upcast, helpers::pick_best_token, RootDatabase}; use ide_db::{base_db::Upcast, helpers::pick_best_token, RootDatabase};
use rustc_hash::FxHashSet;
use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, T}; use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, T};
use crate::{display::TryToNav, FilePosition, NavigationTarget, RangeInfo}; use crate::{display::TryToNav, FilePosition, NavigationTarget, RangeInfo};
@ -55,19 +54,29 @@ pub(crate) fn goto_type_definition(
Some((ty, node)) Some((ty, node))
})?; })?;
let mut res = FxHashSet::default(); let mut res = Vec::new();
let mut workload = vec![ty.strip_references()]; let mut push = |def: hir::ModuleDef| {
while let Some(ty) = workload.pop() { if let Some(nav) = def.try_to_nav(db) {
if let Some(adt) = ty.as_adt() { if !res.contains(&nav) {
res.insert(adt); res.push(nav);
}
} }
workload.extend(ty.strip_references().type_arguments()); };
}
Some(RangeInfo::new( let ty = ty.strip_references();
node.text_range(), ty.walk(db, |t| {
res.into_iter().flat_map(|adt| adt.try_to_nav(db)).collect(), if let Some(adt) = t.as_adt() {
)) push(adt.into());
} else if let Some(trait_) = t.as_dyn_trait() {
push(trait_.into());
} else if let Some(traits) = t.as_impl_traits(db) {
traits.into_iter().for_each(|it| push(it.into()));
} else if let Some(trait_) = t.as_associated_type_parent_trait(db) {
push(trait_.into());
}
});
Some(RangeInfo::new(node.text_range(), res))
} }
#[cfg(test)] #[cfg(test)]