Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide-completion/src/completions/vis.rs')
| -rw-r--r-- | crates/ide-completion/src/completions/vis.rs | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/crates/ide-completion/src/completions/vis.rs b/crates/ide-completion/src/completions/vis.rs index d538f1879e..b971808626 100644 --- a/crates/ide-completion/src/completions/vis.rs +++ b/crates/ide-completion/src/completions/vis.rs @@ -3,23 +3,20 @@ use hir::ScopeDef; use crate::{ - context::{CompletionContext, PathCompletionCtx, PathKind, PathQualifierCtx}, + context::{CompletionContext, PathCompletionCtx, PathKind, PathQualifierCtx, Qualified}, Completions, }; pub(crate) fn complete_vis_path(acc: &mut Completions, ctx: &CompletionContext) { - let (&is_absolute_path, qualifier, &has_in_token) = match ctx.path_context() { - Some(PathCompletionCtx { - kind: PathKind::Vis { has_in_token }, - is_absolute_path, - qualifier, - .. - }) => (is_absolute_path, qualifier, has_in_token), + let (qualified, &has_in_token) = match ctx.path_context() { + Some(PathCompletionCtx { kind: PathKind::Vis { has_in_token }, qualified, .. }) => { + (qualified, has_in_token) + } _ => return, }; - match qualifier { - Some(PathQualifierCtx { resolution, is_super_chain, .. }) => { + match qualified { + Qualified::With(PathQualifierCtx { resolution, is_super_chain, .. }) => { // Try completing next child module of the path that is still a parent of the current module if let Some(hir::PathResolution::Def(hir::ModuleDef::Module(module))) = resolution { let next_towards_current = ctx @@ -40,13 +37,13 @@ pub(crate) fn complete_vis_path(acc: &mut Completions, ctx: &CompletionContext) acc.add_keyword(ctx, "super::"); } } - None if !is_absolute_path => { + Qualified::Absolute => {} + Qualified::No => { if !has_in_token { cov_mark::hit!(kw_completion_in); acc.add_keyword(ctx, "in"); } acc.add_nameref_keywords(ctx); } - _ => {} } } |