Auto merge of rust-lang#12565 - Veykril:completion, r=Veykril

bors · bors · commit e7a0088b2f34 · 2022-06-17T15:32:32.000Z
internal: More completion refactors
diff --git a/crates/ide-completion/src/completions/attribute.rs b/crates/ide-completion/src/completions/attribute.rs
@@ -18,9 +18,7 @@ use syntax::{
 
 use crate::{
     completions::module_or_attr,
-    context::{
-        CompletionContext, IdentContext, PathCompletionCtx, PathKind, PathQualifierCtx, Qualified,
-    },
+    context::{CompletionContext, IdentContext, PathCompletionCtx, PathKind, Qualified},
     item::CompletionItem,
     Completions,
 };
@@ -84,7 +82,7 @@ pub(crate) fn complete_attribute(acc: &mut Completions, ctx: &CompletionContext)
     };
 
     match qualified {
-        Qualified::With(PathQualifierCtx { resolution, is_super_chain, .. }) => {
+        Qualified::With { resolution, is_super_chain, .. } => {
             if *is_super_chain {
                 acc.add_keyword(ctx, "super::");
             }
@@ -112,6 +110,7 @@ pub(crate) fn complete_attribute(acc: &mut Completions, ctx: &CompletionContext)
             });
             acc.add_nameref_keywords_with_colon(ctx);
         }
+        Qualified::Infer => {}
     }
 
     let attributes = annotated_item_kind.and_then(|kind| {
diff --git a/crates/ide-completion/src/completions/attribute/derive.rs b/crates/ide-completion/src/completions/attribute/derive.rs
@@ -5,21 +5,23 @@ use itertools::Itertools;
 use syntax::SmolStr;
 
 use crate::{
-    context::{CompletionContext, PathCompletionCtx, PathKind, PathQualifierCtx, Qualified},
+    context::{CompletionContext, PathCompletionCtx, PathKind, Qualified},
     item::CompletionItem,
     Completions,
 };
 
 pub(crate) fn complete_derive(acc: &mut Completions, ctx: &CompletionContext) {
-    let qualified = match ctx.path_context() {
-        Some(&PathCompletionCtx { kind: PathKind::Derive, ref qualified, .. }) => qualified,
+    let (qualified, existing_derives) = match ctx.path_context() {
+        Some(PathCompletionCtx {
+            kind: PathKind::Derive { existing_derives }, qualified, ..
+        }) => (qualified, existing_derives),
         _ => return,
     };
 
     let core = ctx.famous_defs().core();
 
     match qualified {
-        Qualified::With(PathQualifierCtx { resolution, is_super_chain, .. }) => {
+        Qualified::With { resolution, is_super_chain, .. } => {
             if *is_super_chain {
                 acc.add_keyword(ctx, "super::");
             }
@@ -32,7 +34,7 @@ pub(crate) fn complete_derive(acc: &mut Completions, ctx: &CompletionContext) {
             for (name, def) in module.scope(ctx.db, Some(ctx.module)) {
                 let add_def = match def {
                     ScopeDef::ModuleDef(hir::ModuleDef::Macro(mac)) => {
-                        !ctx.existing_derives.contains(&mac) && mac.is_derive(ctx.db)
+                        !existing_derives.contains(&mac) && mac.is_derive(ctx.db)
                     }
                     ScopeDef::ModuleDef(hir::ModuleDef::Module(_)) => true,
                     _ => false,
@@ -48,7 +50,7 @@ pub(crate) fn complete_derive(acc: &mut Completions, ctx: &CompletionContext) {
             ctx.process_all_names(&mut |name, def| {
                 let mac = match def {
                     ScopeDef::ModuleDef(hir::ModuleDef::Macro(mac))
-                        if !ctx.existing_derives.contains(&mac) && mac.is_derive(ctx.db) =>
+                        if !existing_derives.contains(&mac) && mac.is_derive(ctx.db) =>
                     {
                         mac
                     }
@@ -74,7 +76,7 @@ pub(crate) fn complete_derive(acc: &mut Completions, ctx: &CompletionContext) {
                         let mut components = vec![derive_completion.label];
                         components.extend(derive_completion.dependencies.iter().filter(
                             |&&dependency| {
-                                !ctx.existing_derives
+                                !existing_derives
                                     .iter()
                                     .map(|it| it.name(ctx.db))
                                     .any(|it| it.to_smol_str() == dependency)
@@ -99,6 +101,7 @@ pub(crate) fn complete_derive(acc: &mut Completions, ctx: &CompletionContext) {
             });
             acc.add_nameref_keywords_with_colon(ctx);
         }
+        Qualified::Infer => {}
     }
 }
 
diff --git a/crates/ide-completion/src/completions/expr.rs b/crates/ide-completion/src/completions/expr.rs
@@ -4,9 +4,7 @@ use hir::ScopeDef;
 use ide_db::FxHashSet;
 
 use crate::{
-    context::{
-        NameRefContext, NameRefKind, PathCompletionCtx, PathKind, PathQualifierCtx, Qualified,
-    },
+    context::{NameRefContext, NameRefKind, PathCompletionCtx, PathKind, Qualified},
     CompletionContext, Completions,
 };
 
@@ -61,15 +59,13 @@ pub(crate) fn complete_expr_path(acc: &mut Completions, ctx: &CompletionContext)
     };
 
     match qualified {
-        Qualified::With(PathQualifierCtx { is_infer_qualifier, resolution, .. }) => {
-            if *is_infer_qualifier {
-                ctx.traits_in_scope()
-                    .0
-                    .into_iter()
-                    .flat_map(|it| hir::Trait::from(it).items(ctx.sema.db))
-                    .for_each(|item| add_assoc_item(acc, ctx, item));
-                return;
-            }
+        Qualified::Infer => ctx
+            .traits_in_scope()
+            .0
+            .into_iter()
+            .flat_map(|it| hir::Trait::from(it).items(ctx.sema.db))
+            .for_each(|item| add_assoc_item(acc, ctx, item)),
+        Qualified::With { resolution, .. } => {
             let resolution = match resolution {
                 Some(it) => it,
                 None => return,
diff --git a/crates/ide-completion/src/completions/flyimport.rs b/crates/ide-completion/src/completions/flyimport.rs
@@ -120,7 +120,7 @@ pub(crate) fn import_on_the_fly(acc: &mut Completions, ctx: &CompletionContext)
                         kind @ (PathKind::Expr { .. }
                         | PathKind::Type { .. }
                         | PathKind::Attr { .. }
-                        | PathKind::Derive
+                        | PathKind::Derive { .. }
                         | PathKind::Pat),
                     ..
                 })),
@@ -188,10 +188,10 @@ pub(crate) fn import_on_the_fly(acc: &mut Completions, ctx: &CompletionContext)
             (PathKind::Attr { .. }, ItemInNs::Macros(mac)) => mac.is_attr(ctx.db),
             (PathKind::Attr { .. }, _) => false,
 
-            (PathKind::Derive, ItemInNs::Macros(mac)) => {
-                mac.is_derive(ctx.db) && !ctx.existing_derives.contains(&mac)
+            (PathKind::Derive { existing_derives }, ItemInNs::Macros(mac)) => {
+                mac.is_derive(ctx.db) && !existing_derives.contains(&mac)
             }
-            (PathKind::Derive, _) => false,
+            (PathKind::Derive { .. }, _) => false,
         }
     };
 
diff --git a/crates/ide-completion/src/completions/item_list.rs b/crates/ide-completion/src/completions/item_list.rs
@@ -2,7 +2,7 @@
 
 use crate::{
     completions::module_or_fn_macro,
-    context::{ItemListKind, PathCompletionCtx, PathKind, PathQualifierCtx, Qualified},
+    context::{ItemListKind, PathCompletionCtx, PathKind, Qualified},
     CompletionContext, Completions,
 };
 
@@ -44,7 +44,7 @@ pub(crate) fn complete_item_list(acc: &mut Completions, ctx: &CompletionContext)
     }
 
     match qualified {
-        Qualified::With(PathQualifierCtx { resolution, is_super_chain, .. }) => {
+        Qualified::With { resolution, is_super_chain, .. } => {
             if let Some(hir::PathResolution::Def(hir::ModuleDef::Module(module))) = resolution {
                 for (name, def) in module.scope(ctx.db, Some(ctx.module)) {
                     if let Some(def) = module_or_fn_macro(ctx.db, def) {
@@ -66,7 +66,7 @@ pub(crate) fn complete_item_list(acc: &mut Completions, ctx: &CompletionContext)
             });
             acc.add_nameref_keywords_with_colon(ctx);
         }
-        Qualified::No => {}
+        Qualified::Infer | Qualified::No => {}
     }
 }
 
diff --git a/crates/ide-completion/src/completions/pattern.rs b/crates/ide-completion/src/completions/pattern.rs
@@ -5,7 +5,7 @@ use ide_db::FxHashSet;
 use syntax::ast::Pat;
 
 use crate::{
-    context::{PathCompletionCtx, PathQualifierCtx, PatternRefutability, Qualified},
+    context::{PathCompletionCtx, PatternRefutability, Qualified},
     CompletionContext, Completions,
 };
 
@@ -114,7 +114,7 @@ fn pattern_path_completion(
     PathCompletionCtx { qualified, .. }: &PathCompletionCtx,
 ) {
     match qualified {
-        Qualified::With(PathQualifierCtx { resolution, is_super_chain, .. }) => {
+        Qualified::With { resolution, is_super_chain, .. } => {
             if *is_super_chain {
                 acc.add_keyword(ctx, "super::");
             }
@@ -208,5 +208,6 @@ fn pattern_path_completion(
 
             acc.add_nameref_keywords_with_colon(ctx);
         }
+        Qualified::Infer => {}
     }
 }
diff --git a/crates/ide-completion/src/completions/type.rs b/crates/ide-completion/src/completions/type.rs
@@ -5,10 +5,7 @@ use ide_db::FxHashSet;
 use syntax::{ast, AstNode};
 
 use crate::{
-    context::{
-        PathCompletionCtx, PathKind, PathQualifierCtx, Qualified, TypeAscriptionTarget,
-        TypeLocation,
-    },
+    context::{PathCompletionCtx, PathKind, Qualified, TypeAscriptionTarget, TypeLocation},
     render::render_type_inference,
     CompletionContext, Completions,
 };
@@ -55,15 +52,13 @@ pub(crate) fn complete_type_path(acc: &mut Completions, ctx: &CompletionContext)
     };
 
     match qualified {
-        Qualified::With(PathQualifierCtx { is_infer_qualifier, resolution, .. }) => {
-            if *is_infer_qualifier {
-                ctx.traits_in_scope()
-                    .0
-                    .into_iter()
-                    .flat_map(|it| hir::Trait::from(it).items(ctx.sema.db))
-                    .for_each(|item| add_assoc_item(acc, item));
-                return;
-            }
+        Qualified::Infer => ctx
+            .traits_in_scope()
+            .0
+            .into_iter()
+            .flat_map(|it| hir::Trait::from(it).items(ctx.sema.db))
+            .for_each(|item| add_assoc_item(acc, item)),
+        Qualified::With { resolution, .. } => {
             let resolution = match resolution {
                 Some(it) => it,
                 None => return,
diff --git a/crates/ide-completion/src/completions/use_.rs b/crates/ide-completion/src/completions/use_.rs
@@ -6,31 +6,30 @@ use syntax::{ast, AstNode};
 
 use crate::{
     context::{
-        CompletionContext, NameRefContext, NameRefKind, PathCompletionCtx, PathKind,
-        PathQualifierCtx, Qualified,
+        CompletionContext, NameRefContext, NameRefKind, PathCompletionCtx, PathKind, Qualified,
     },
     item::Builder,
     CompletionItem, CompletionItemKind, CompletionRelevance, Completions,
 };
 
 pub(crate) fn complete_use_tree(acc: &mut Completions, ctx: &CompletionContext) {
-    let (qualified, name_ref) = match ctx.nameref_ctx() {
+    let (qualified, name_ref, use_tree_parent) = match ctx.nameref_ctx() {
         Some(NameRefContext {
-            kind: Some(NameRefKind::Path(PathCompletionCtx { kind: PathKind::Use, qualified, .. })),
+            kind:
+                Some(NameRefKind::Path(PathCompletionCtx {
+                    kind: PathKind::Use,
+                    qualified,
+                    use_tree_parent,
+                    ..
+                })),
             nameref,
             ..
-        }) => (qualified, nameref),
+        }) => (qualified, nameref, use_tree_parent),
         _ => return,
     };
 
     match qualified {
-        Qualified::With(PathQualifierCtx {
-            path,
-            resolution,
-            is_super_chain,
-            use_tree_parent,
-            ..
-        }) => {
+        Qualified::With { path, resolution, is_super_chain } => {
             if *is_super_chain {
                 acc.add_keyword(ctx, "super::");
             }
@@ -136,5 +135,6 @@ pub(crate) fn complete_use_tree(acc: &mut Completions, ctx: &CompletionContext)
             });
             acc.add_nameref_keywords_with_colon(ctx);
         }
+        Qualified::Infer => {}
     }
 }
diff --git a/crates/ide-completion/src/completions/vis.rs b/crates/ide-completion/src/completions/vis.rs
@@ -3,7 +3,7 @@
 use hir::ScopeDef;
 
 use crate::{
-    context::{CompletionContext, PathCompletionCtx, PathKind, PathQualifierCtx, Qualified},
+    context::{CompletionContext, PathCompletionCtx, PathKind, Qualified},
     Completions,
 };
 
@@ -16,7 +16,7 @@ pub(crate) fn complete_vis_path(acc: &mut Completions, ctx: &CompletionContext)
     };
 
     match qualified {
-        Qualified::With(PathQualifierCtx { resolution, is_super_chain, .. }) => {
+        Qualified::With { 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
@@ -37,7 +37,7 @@ pub(crate) fn complete_vis_path(acc: &mut Completions, ctx: &CompletionContext)
                 acc.add_keyword(ctx, "super::");
             }
         }
-        Qualified::Absolute => {}
+        Qualified::Absolute | Qualified::Infer => {}
         Qualified::No => {
             if !has_in_token {
                 cov_mark::hit!(kw_completion_in);
diff --git a/crates/ide-completion/src/context.rs b/crates/ide-completion/src/context.rs
diff --git a/crates/ide-completion/src/context/analysis.rs b/crates/ide-completion/src/context/analysis.rs

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`use crate::{`
`4`	`4`	`completions::module_or_fn_macro,`
`5`		`- context::{ItemListKind, PathCompletionCtx, PathKind, PathQualifierCtx, Qualified},`
	`5`	`+ context::{ItemListKind, PathCompletionCtx, PathKind, Qualified},`
`6`	`6`	`CompletionContext, Completions,`
`7`	`7`	`};`
`8`	`8`
`@@ -44,7 +44,7 @@ pub(crate) fn complete_item_list(acc: &mut Completions, ctx: &CompletionContext)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`match qualified {`
`47`		`- Qualified::With(PathQualifierCtx { resolution, is_super_chain, .. }) => {`
	`47`	`+ Qualified::With { resolution, is_super_chain, .. } => {`
`48`	`48`	`if let Some(hir::PathResolution::Def(hir::ModuleDef::Module(module))) = resolution {`
`49`	`49`	`for (name, def) in module.scope(ctx.db, Some(ctx.module)) {`
`50`	`50`	`if let Some(def) = module_or_fn_macro(ctx.db, def) {`
`@@ -66,7 +66,7 @@ pub(crate) fn complete_item_list(acc: &mut Completions, ctx: &CompletionContext)`
`66`	`66`	`});`
`67`	`67`	`acc.add_nameref_keywords_with_colon(ctx);`
`68`	`68`	`}`
`69`		`- Qualified::No => {}`
	`69`	`+ Qualified::Infer \| Qualified::No => {}`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ use ide_db::FxHashSet;`
`5`	`5`	`use syntax::ast::Pat;`
`6`	`6`
`7`	`7`	`use crate::{`
`8`		`- context::{PathCompletionCtx, PathQualifierCtx, PatternRefutability, Qualified},`
	`8`	`+ context::{PathCompletionCtx, PatternRefutability, Qualified},`
`9`	`9`	`CompletionContext, Completions,`
`10`	`10`	`};`
`11`	`11`
`@@ -114,7 +114,7 @@ fn pattern_path_completion(`
`114`	`114`	`PathCompletionCtx { qualified, .. }: &PathCompletionCtx,`
`115`	`115`	`) {`
`116`	`116`	`match qualified {`
`117`		`- Qualified::With(PathQualifierCtx { resolution, is_super_chain, .. }) => {`
	`117`	`+ Qualified::With { resolution, is_super_chain, .. } => {`
`118`	`118`	`if *is_super_chain {`
`119`	`119`	`acc.add_keyword(ctx, "super::");`
`120`	`120`	`}`
`@@ -208,5 +208,6 @@ fn pattern_path_completion(`
`208`	`208`
`209`	`209`	`acc.add_nameref_keywords_with_colon(ctx);`
`210`	`210`	`}`
	`211`	`+ Qualified::Infer => {}`
`211`	`212`	`}`
`212`	`213`	`}`