internal: NameRefKind classification is not optional

Author: Veykril

crates/ide-completion/src/completions/flyimport.rs

@@ -123,7 +123,7 @@ pub(crate) fn import_on_the_fly_path(
                 | PathKind::Type { .. }
                 | PathKind::Attr { .. }
                 | PathKind::Derive { .. }
-                | PathKind::Pat),
+                | PathKind::Pat { .. }),
             qualified,
             ..
         } => (Some(kind), qualified),
@@ -183,7 +183,7 @@ pub(crate) fn import_on_the_fly_pat(
         return None;
     }
     let kind = match pat_ctx {
-        PatternContext { record_pat: None, .. } => PathKind::Pat,
+        PatternContext { record_pat: None, .. } => PathKind::Pat { pat_ctx: pat_ctx.clone() },
         _ => return None,
     };
 
@@ -229,15 +229,17 @@ fn import_on_the_fly(
                 PathKind::Expr { .. }
                 | PathKind::Type { .. }
                 | PathKind::Item { .. }
-                | PathKind::Pat,
+                | PathKind::Pat { .. },
                 ItemInNs::Macros(mac),
             ) => mac.is_fn_like(ctx.db),
             (PathKind::Item { .. }, _) => true,
 
             (PathKind::Expr { .. }, ItemInNs::Types(_) | ItemInNs::Values(_)) => true,
 
-            (PathKind::Pat, ItemInNs::Types(_)) => true,
-            (PathKind::Pat, ItemInNs::Values(def)) => matches!(def, hir::ModuleDef::Const(_)),
+            (PathKind::Pat { .. }, ItemInNs::Types(_)) => true,
+            (PathKind::Pat { .. }, ItemInNs::Values(def)) => {
+                matches!(def, hir::ModuleDef::Const(_))
+            }
 
             (PathKind::Type { location }, ItemInNs::Types(ty)) => {
                 if matches!(location, TypeLocation::TypeBound) {

crates/ide-completion/src/completions/item_list/trait_impl.rs

@@ -95,12 +95,12 @@ pub(crate) fn complete_trait_impl_name_ref(
         NameRefContext {
             nameref,
             kind:
-                Some(NameRefKind::Path(
+                NameRefKind::Path(
                     path_ctx @ PathCompletionCtx {
                         kind: PathKind::Item { kind: ItemListKind::TraitImpl },
                         ..
                     },
-                )),
+                ),
         } if path_ctx.is_trivial_path() => complete_trait_impl(
             acc,
             ctx,

crates/ide-completion/src/completions/pattern.rs

@@ -107,7 +107,7 @@ pub(crate) fn pattern_path_completion(
     ctx: &CompletionContext,
     PathCompletionCtx { qualified, kind, .. }: &PathCompletionCtx,
 ) {
-    if !matches!(kind, PathKind::Pat) {
+    if !matches!(kind, PathKind::Pat { .. }) {
         return;
     }
     match qualified {

crates/ide-completion/src/completions/use_.rs

@@ -20,12 +20,12 @@ pub(crate) fn complete_use_tree(
     let (qualified, name_ref, use_tree_parent) = match name_ref_ctx {
         NameRefContext {
             kind:
-                Some(NameRefKind::Path(PathCompletionCtx {
+                NameRefKind::Path(PathCompletionCtx {
                     kind: PathKind::Use,
                     qualified,
                     use_tree_parent,
                     ..
-                })),
+                }),
             nameref,
             ..
         } => (qualified, nameref, use_tree_parent),

crates/ide-completion/src/context.rs

@@ -85,7 +85,7 @@ impl PathCompletionCtx {
 }
 
 /// The kind of path we are completing right now.
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Debug, PartialEq, Eq)]
 pub(super) enum PathKind {
     Expr {
         in_block_expr: bool,
@@ -110,7 +110,9 @@ pub(super) enum PathKind {
     Item {
         kind: ItemListKind,
     },
-    Pat,
+    Pat {
+        pat_ctx: PatternContext,
+    },
     Vis {
         has_in_token: bool,
     },
@@ -164,7 +166,7 @@ pub(super) enum Qualified {
 }
 
 /// The state of the pattern we are completing.
-#[derive(Debug)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub(super) struct PatternContext {
     pub(super) refutability: PatternRefutability,
     pub(super) param_ctx: Option<(ast::ParamList, ast::Param, ParamKind)>,
@@ -208,7 +210,7 @@ pub(super) enum NameKind {
     ConstParam,
     Enum,
     Function,
-    IdentPat,
+    IdentPat(PatternContext),
     MacroDef,
     MacroRules,
     /// Fake node
@@ -230,8 +232,7 @@ pub(super) enum NameKind {
 pub(super) struct NameRefContext {
     /// NameRef syntax in the original file
     pub(super) nameref: Option<ast::NameRef>,
-    // FIXME: This shouldn't be an Option
-    pub(super) kind: Option<NameRefKind>,
+    pub(super) kind: NameRefKind,
 }
 
 /// The kind of the NameRef we are completing.
@@ -243,6 +244,7 @@ pub(super) enum NameRefKind {
     Keyword(ast::Item),
     /// The record expression this nameref is a field of
     RecordExpr(ast::RecordExpr),
+    Pattern(PatternContext),
 }
 
 /// The identifier we are currently completing.
@@ -330,7 +332,6 @@ pub(crate) struct CompletionContext<'a> {
 
     // We might wanna split these out of CompletionContext
     pub(super) ident_ctx: IdentContext,
-    pub(super) pattern_ctx: Option<PatternContext>,
     pub(super) qualifier_ctx: QualifierCtx,
 
     pub(super) locals: FxHashMap<Name, Local>,
@@ -505,7 +506,6 @@ impl<'a> CompletionContext<'a> {
             previous_token: None,
             // dummy value, will be overwritten
             ident_ctx: IdentContext::UnexpandedAttrTT { fake_attribute_under_caret: None },
-            pattern_ctx: None,
             qualifier_ctx: Default::default(),
             locals,
         };