common filter

Author: zth

analysis/src/CompletionBackEnd.ml

@@ -1502,6 +1502,13 @@ let rec extractType ~env ~package (t : Types.type_expr) =
   | Ttuple expressions -> Some (Tuple (env, expressions))
   | _ -> None
 
+let filterItems items ~prefix =
+  if prefix = "" then items
+  else
+    items
+    |> List.filter (fun (item : Completion.t) ->
+           Utils.startsWith item.name prefix)
+
 let completeTypedValue ~env ~envWhereCompletionStarted ~full ~prefix
     ~expandOption =
   let namesUsed = Hashtbl.create 10 in
@@ -1511,65 +1518,45 @@ let completeTypedValue ~env ~envWhereCompletionStarted ~full ~prefix
       | Some (Toption (env, typ)) when expandOption ->
         typ |> completeTypedValueInner ~env ~full ~prefix ~expandOption:false
       | Some (Tbool env) ->
-        let items =
-          [
-            Completion.create ~name:"true"
-              ~kind:(Label (t |> Shared.typeToString))
-              ~env;
-            Completion.create ~name:"false"
-              ~kind:(Label (t |> Shared.typeToString))
-              ~env;
-          ]
-        in
-        if prefix = "" then items
-        else
-          items
-          |> List.filter (fun (item : Completion.t) ->
-                 Utils.startsWith item.name prefix)
+        [
+          Completion.create ~name:"true"
+            ~kind:(Label (t |> Shared.typeToString))
+            ~env;
+          Completion.create ~name:"false"
+            ~kind:(Label (t |> Shared.typeToString))
+            ~env;
+        ]
+        |> filterItems ~prefix
       | Some (Tvariant {env; constructors; variantDecl; variantName}) ->
-        let items =
-          constructors
-          |> List.filter_map (fun (constructor : Constructor.t) ->
-                 if
-                   prefix <> ""
-                   && not (Utils.startsWith constructor.cname.txt prefix)
-                 then None
-                 else
-                   Some
-                     (Completion.create
-                        ~name:
-                          (constructor.cname.txt
-                          ^
-                          if constructor.args |> List.length > 0 then
-                            "("
-                            ^ (constructor.args
-                              |> List.map (fun _ -> "_")
-                              |> String.concat ", ")
-                            ^ ")"
-                          else "")
-                        ~kind:
-                          (Constructor
-                             ( constructor,
-                               variantDecl |> Shared.declToString variantName ))
-                        ~env))
-        in
-        items
+        constructors
+        |> List.map (fun (constructor : Constructor.t) ->
+               Completion.create
+                 ~name:
+                   (constructor.cname.txt
+                   ^
+                   if constructor.args |> List.length > 0 then
+                     "("
+                     ^ (constructor.args
+                       |> List.map (fun _ -> "_")
+                       |> String.concat ", ")
+                     ^ ")"
+                   else "")
+                 ~kind:
+                   (Constructor
+                      ( constructor,
+                        variantDecl |> Shared.declToString variantName ))
+                 ~env)
+        |> filterItems ~prefix
       | Some (Toption (env, t)) ->
-        let items =
-          [
-            Completion.create ~name:"None"
-              ~kind:(Label (t |> Shared.typeToString))
-              ~env;
-            Completion.create ~name:"Some(_)"
-              ~kind:(Label (t |> Shared.typeToString))
-              ~env;
-          ]
-        in
-        if prefix = "" then items
-        else
-          items
-          |> List.filter (fun (item : Completion.t) ->
-                 Utils.startsWith item.name prefix)
+        [
+          Completion.create ~name:"None"
+            ~kind:(Label (t |> Shared.typeToString))
+            ~env;
+          Completion.create ~name:"Some(_)"
+            ~kind:(Label (t |> Shared.typeToString))
+            ~env;
+        ]
+        |> filterItems ~prefix
       | _ -> []
     in
     (* Include all values and modules in completion if there's a prefix, not otherwise *)