Completion: for perf reasons first check completion context.

analysis/src/Commands.ml

@@ -34,13 +34,10 @@ let dump files =
 let completion ~path ~line ~col ~currentFile =
   let uri = Uri2.fromPath path in
   let result =
-    match ProcessCmt.getFullFromCmt ~uri with
-    | None -> "[]"
-    | Some full ->
-      let maybeText = Files.readFile currentFile in
-      NewCompletions.computeCompletions ~full ~maybeText ~pos:(line, col)
-      |> List.map Protocol.stringifyCompletionItem
-      |> Protocol.array
+    let textOpt = Files.readFile currentFile in
+    NewCompletions.computeCompletions ~uri ~textOpt ~pos:(line, col)
+    |> List.map Protocol.stringifyCompletionItem
+    |> Protocol.array
   in
   print_endline result
 

analysis/src/NewCompletions.ml

@@ -1133,26 +1133,31 @@ let processCompletable ~findItems ~full ~package ~rawOpens
            Utils.startsWith name prefix && not (List.mem name identsSeen))
     |> List.map mkLabel
 
-let computeCompletions ~full ~maybeText ~pos =
-  let package = full.package in
-  match maybeText with
+let computeCompletions ~uri ~textOpt ~pos =
+  match textOpt with
   | None -> []
   | Some text -> (
     match PartialParser.positionToOffset text pos with
     | None -> []
     | Some offset -> (
       match PartialParser.findCompletable text offset with
       | None -> []
-      | Some completable ->
-        let rawOpens = PartialParser.findOpens text offset in
-        let allModules = package.localModules @ package.dependencyModules in
-        let findItems ~exact parts =
-          let items =
-            getItems ~full ~package ~rawOpens ~allModules ~pos ~parts
+      | Some completable -> (
+        match ProcessCmt.getFullFromCmt ~uri with
+        | None -> []
+        | Some full ->
+          let rawOpens = PartialParser.findOpens text offset in
+          let package = full.package in
+          let allModules = package.localModules @ package.dependencyModules in
+          let findItems ~exact parts =
+            let items =
+              getItems ~full ~package ~rawOpens ~allModules ~pos ~parts
+            in
+            match parts |> List.rev with
+            | last :: _ when exact ->
+              items
+              |> List.filter (fun {SharedTypes.name = {txt}} -> txt = last)
+            | _ -> items
           in
-          match parts |> List.rev with
-          | last :: _ when exact ->
-            items |> List.filter (fun {SharedTypes.name = {txt}} -> txt = last)
-          | _ -> items
-        in
-        completable |> processCompletable ~findItems ~full ~package ~rawOpens))
+          completable |> processCompletable ~findItems ~full ~package ~rawOpens)
+      ))