language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 20:42:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

internal: Collapse lift is_infer_qualifier into Qualified variant

Browse source
This commit is contained in:
Lukas Wirth 2022-06-17 17:15:29 +02:00
parent 2f2ea77d88
commit d6f161ffa9
10 changed files with 41 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/ide-completion/src/context/analysis.rs
View file

@ -861,10 +861,6 @@ impl<'a> CompletionContext<'a> {
.and_then(|it| find_node_in_file(original_file, &it))
.map(|it| it.parent_path());
if let Some(path) = path {
let res = sema.resolve_path(&path);
let is_super_chain = iter::successors(Some(path.clone()), |p| p.qualifier())
.all(|p| p.segment().and_then(|s| s.super_token()).is_some());
// `<_>::$0`
let is_infer_qualifier = path.qualifier().is_none()
&& matches!(
@ -875,13 +871,20 @@ impl<'a> CompletionContext<'a> {
})
);
path_ctx.qualified = Qualified::With(PathQualifierCtx {
path,
resolution: res,
is_super_chain,
use_tree_parent,
is_infer_qualifier,
})
path_ctx.qualified = if is_infer_qualifier {
Qualified::Infer
} else {
let res = sema.resolve_path(&path);
let is_super_chain =
iter::successors(Some(path.clone()), |p| p.qualifier())
.all(|p| p.segment().and_then(|s| s.super_token()).is_some());
Qualified::With(PathQualifierCtx {
path,
resolution: res,
is_super_chain,
use_tree_parent,
})
}
};
}
} else if let Some(segment) = path.segment() {