simplify setting completion pattern

Author: zth

analysis/src/CompletionBackEnd.ml

@@ -2173,7 +2173,7 @@ Note: The `@react.component` decorator requires the react-jsx config to be set i
            Utils.startsWith name prefix
            && (forHover || not (List.mem name identsSeen)))
     |> List.map mkLabel
-  | Cpattern {typ; prefix; nested = None} -> (
+  | Cpattern {typ; prefix; nested = []} -> (
     let envWhereCompletionStarted = env in
     match
       typ
@@ -2186,7 +2186,7 @@ Note: The `@react.component` decorator requires the react-jsx config to be set i
       |> completeTypedValue ~env ~envWhereCompletionStarted ~full ~prefix
            ~expandOption:false ~includeLocalValues:false ~completionContext:None
     | None -> [])
-  | Cpattern {typ; prefix; nested = Some nested} -> (
+  | Cpattern {typ; prefix; nested} -> (
     let envWhereCompletionStarted = env in
     match
       typ

analysis/src/CompletionFrontEnd.ml

@@ -634,11 +634,10 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
   in
   let completePattern (pat : Parsetree.pattern) =
     match (pat |> traversePattern ~patternPath:[], !lookingForPat) with
-    | Some (prefix, []), Some (Completable.Cpattern p) ->
-      setResult (Completable.Cpattern {p with prefix; nested = None})
-    | Some (prefix, nestedPattern), Some (Cpattern p) ->
+    | Some (prefix, nestedPattern), Some ctxPath ->
       setResult
-        (Cpattern {p with prefix; nested = Some (List.rev nestedPattern)})
+        (Completable.Cpattern
+           {typ = ctxPath; prefix; nested = List.rev nestedPattern})
     | _ -> ()
   in
   let scopeValueBinding (vb : Parsetree.value_binding) =
@@ -674,8 +673,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
       !scope |> Scope.addModule ~name:md.pmd_name.txt ~loc:md.pmd_name.loc
   in
   let setLookingForPat ctxPath =
-    lookingForPat :=
-      Some (Completable.Cpattern {typ = ctxPath; prefix = ""; nested = None});
+    lookingForPat := Some ctxPath;
     if debug then
       Printf.printf "looking for: %s \n" (Completable.toString (Cpath ctxPath))
   in
@@ -706,7 +704,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
         | None -> ()
         | Some ctxPath ->
           setResult
-            (Completable.Cpattern {typ = ctxPath; nested = None; prefix = ""}))
+            (Completable.Cpattern {typ = ctxPath; nested = []; prefix = ""}))
       | Pexp_match (exp, _cases) -> (
         (* If there's more than one case, or the case isn't a pattern hole, set that we're looking for this path currently. *)
         match exp |> exprToContextPath with

analysis/src/SharedTypes.ml

@@ -592,11 +592,7 @@ module Completable = struct
         propName: string;
         prefix: string;
       }
-    | Cpattern of {
-        typ: contextPath;
-        nested: patternPath list option;
-        prefix: string;
-      }
+    | Cpattern of {typ: contextPath; nested: patternPath list; prefix: string}
 
   (** An extracted type from a type expr *)
   type extractedType =
@@ -677,8 +673,8 @@ module Completable = struct
       ^ (if prefix = "" then "" else "=" ^ prefix)
       ^
       match nested with
-      | None -> ""
-      | Some patternPaths ->
+      | [] -> ""
+      | patternPaths ->
         "->"
         ^ (patternPaths
           |> List.map (fun patternPath -> patternPathToString patternPath)