get rid off option

Author: zth

analysis/src/CompletionBackEnd.ml

@@ -1047,7 +1047,7 @@ let printConstructorArgs argsLen ~asSnippet =
   if List.length !args > 0 then "(" ^ (!args |> String.concat ", ") ^ ")"
   else ""
 
-type completionMode = Pattern of Completable.patternMode option | Expression
+type completionMode = Pattern of Completable.patternMode | Expression
 
 let rec completeTypedValue ~full ~prefix ~completionContext ~mode
     (t : SharedTypes.completionType) =
@@ -1143,7 +1143,7 @@ let rec completeTypedValue ~full ~prefix ~completionContext ~mode
              List.mem field.fname.txt seenFields = false)
       |> List.map (fun (field : field) ->
              match (field.optional, mode) with
-             | true, Pattern (Some Destructuring) ->
+             | true, Pattern Destructuring ->
                Completion.create ("?" ^ field.fname.txt)
                  ~docstring:
                    [

analysis/src/CompletionFrontEnd.ml

@@ -317,7 +317,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
              prefix;
              nested = List.rev nestedPattern;
              fallback = None;
-             patternMode = None;
+             patternMode = Default;
            })
     | _ -> ()
   in
@@ -392,7 +392,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
                  nested = [];
                  prefix = "";
                  fallback = None;
-                 patternMode = None;
+                 patternMode = Default;
                }))
       | Pexp_match (exp, cases) -> (
         (* If there's more than one case, or the case isn't a pattern hole, figure out if we're completing another
@@ -425,7 +425,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
                    nested = [];
                    prefix = "";
                    fallback = None;
-                   patternMode = None;
+                   patternMode = Default;
                  })
           | false, false -> ()))
       | _ -> unsetLookingForPat ()
@@ -527,7 +527,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
                prefix;
                nested = List.rev nested;
                fallback = None;
-               patternMode = Some Destructuring;
+               patternMode = Destructuring;
              })
       | _ -> ())
     | _ -> ());

analysis/src/SharedTypes.ml

@@ -631,7 +631,7 @@ module Completable = struct
       ^ ")"
     | NArray -> "array"
 
-  type patternMode = Destructuring
+  type patternMode = Default | Destructuring
 
   type t =
     | Cdecorator of string  (** e.g. @module *)
@@ -650,7 +650,7 @@ module Completable = struct
         contextPath: contextPath;
         nested: nestedPath list;
         prefix: string;
-        patternMode: patternMode option;
+        patternMode: patternMode;
         fallback: t option;
       }
     | CexhaustiveSwitch of {contextPath: contextPath; exprLoc: Location.t}