Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-14 17:07:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix SearchScope::reverse_dependencies trying to search more files than necessary

Browse source
This commit is contained in:
Lukas Wirth 2022-04-06 14:24:06 +02:00
parent d9f6cee100
commit 4e6390bb12
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crates/ide_db/src/search.rs
View file

@ -102,12 +102,18 @@ impl SearchScope {
/// Build a search scope spanning all the reverse dependencies of the given crate.
fn reverse_dependencies(db: &RootDatabase, of: hir::Crate) -> SearchScope {
let mut entries = FxHashMap::default();
for rev_dep in of.transitive_reverse_dependencies(db) {
let root_file = rev_dep.root_file(db);
let source_root_id = db.file_source_root(root_file);
let source_root = db.source_root(source_root_id);
entries.extend(source_root.iter().map(|id| (id, None)));
}
let mut insert_modules = |of: hir::Crate| {
entries.extend(of.modules(db).into_iter().filter_map(|module| {
match module.definition_source(db) {
InFile { file_id, value: ModuleSource::SourceFile(..) } => {
Some((file_id.original_file(db), None))
}
_ => None,
}
}));
};
insert_modules(of);
of.transitive_reverse_dependencies(db).into_iter().for_each(insert_modules);
SearchScope { entries }
}