wip

Author: zth

analysis/src/Commands.ml

@@ -12,6 +12,20 @@ let completion ~debug ~path ~pos ~currentFile =
     |> List.map Protocol.stringifyCompletionItem
     |> Protocol.array)
 
+let completionNew ~debug ~path ~pos ~currentFile =
+  let completions =
+    match
+      Completions.getCompletions2 ~debug ~path ~pos ~currentFile ~forHover:false
+    with
+    | None -> []
+    | Some (completions, _, _) -> completions
+  in
+  print_endline
+    (completions
+    |> List.map CompletionBackEnd.completionToItem
+    |> List.map Protocol.stringifyCompletionItem
+    |> Protocol.array)
+
 let inlayhint ~path ~pos ~maxLength ~debug =
   let result =
     match Hint.inlay ~path ~pos ~maxLength ~debug with
@@ -321,8 +335,7 @@ let test ~path =
               ("Complete2 " ^ path ^ " " ^ string_of_int line ^ ":"
              ^ string_of_int col);
             let currentFile = createCurrentFile () in
-            Completions.getCompletions2 ~forHover:false ~debug:true ~path
-              ~pos:(line, col) ~currentFile;
+            completionNew ~debug:true ~path ~pos:(line, col) ~currentFile;
             Sys.remove currentFile
           | "dce" ->
             print_endline ("DCE " ^ path);

analysis/src/CompletionBackEnd.ml

@@ -286,7 +286,10 @@ let processLocalValue name loc contextPath ~prefix ~exact ~env
         Completion.create name ~env
           ~kind:
             (match contextPath with
-            | Some contextPath -> FollowContextPath contextPath
+            | Some (Scope.Completable contextPath) ->
+              FollowContextPath (`Completable contextPath)
+            | Some (Scope.New contextPath) ->
+              FollowContextPath (`New contextPath)
             | None ->
               Value
                 (Ctype.newconstr
@@ -628,7 +631,7 @@ let rec completionsGetCompletionType2 ~debug ~full ~opens ~rawOpens ~pos ~scope
   | {Completion.kind = ObjLabel typ; env} :: _
   | {Completion.kind = Field ({typ}, _); env} :: _ ->
     Some (TypeExpr typ, env)
-  | {Completion.kind = FollowContextPath ctxPath; env} :: _ ->
+  | {Completion.kind = FollowContextPath (`Completable ctxPath); env} :: _ ->
     ctxPath
     |> getCompletionsForContextPath ~debug ~full ~env ~exact:true ~opens
          ~rawOpens ~pos ~scope
@@ -647,7 +650,7 @@ and completionsGetTypeEnv2 ~debug (completions : Completion.t list) ~full ~opens
   | {Completion.kind = Value typ; env} :: _ -> Some (typ, env)
   | {Completion.kind = ObjLabel typ; env} :: _ -> Some (typ, env)
   | {Completion.kind = Field ({typ}, _); env} :: _ -> Some (typ, env)
-  | {Completion.kind = FollowContextPath ctxPath; env} :: _ ->
+  | {Completion.kind = FollowContextPath (`Completable ctxPath); env} :: _ ->
     ctxPath
     |> getCompletionsForContextPath ~debug ~full ~opens ~rawOpens ~pos ~env
          ~exact:true ~scope