user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify

Browse source
This commit is contained in:
Jonas Schievink 2022-04-14 13:00:08 +02:00
parent 5620d25972
commit f5403aef96
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/ide_assists/src/handlers/expand_glob_import.rs
View file

@ -52,7 +52,7 @@ pub(crate) fn expand_glob_import(acc: &mut Assists, ctx: &AssistContext) -> Opti
let current_scope = ctx.sema.scope(&star.parent()?)?;
let current_module = current_scope.module();
let refs_in_target = find_refs_in_mod(ctx, target_module, Some(current_module))?;
let refs_in_target = find_refs_in_mod(ctx, target_module, current_module)?;
let imported_defs = find_imported_defs(ctx, star)?;
let target = parent.either(|n| n.syntax().clone(), |n| n.syntax().clone());
@ -168,18 +168,12 @@ impl Refs {
}
}
fn find_refs_in_mod(
ctx: &AssistContext,
module: Module,
visible_from: Option<Module>,
) -> Option<Refs> {
if let Some(from) = visible_from {
if !is_mod_visible_from(ctx, module, from) {
return None;
}
fn find_refs_in_mod(ctx: &AssistContext, module: Module, visible_from: Module) -> Option<Refs> {
if !is_mod_visible_from(ctx, module, visible_from) {
return None;
}
let module_scope = module.scope(ctx.db(), visible_from);
let module_scope = module.scope(ctx.db(), Some(visible_from));
let refs = module_scope.into_iter().filter_map(|(n, d)| Ref::from_scope_def(n, d)).collect();
Some(Refs(refs))
}