restore most of old setup so it can run in parallell

Author: zth

analysis/bin/main.ml

@@ -132,6 +132,11 @@ let main () =
     Commands.completion ~debug ~path
       ~pos:(int_of_string line, int_of_string col)
       ~currentFile
+  | [_; "completion-revamped"; path; line; col; currentFile] ->
+    printHeaderInfo path line col;
+    Commands.completionRevamped ~debug ~path
+      ~pos:(int_of_string line, int_of_string col)
+      ~currentFile
   | [_; "completionResolve"; path; modulePath] ->
     Commands.completionResolve ~path ~modulePath
   | [_; "definition"; path; line; col] ->
@@ -143,10 +148,10 @@ let main () =
       ~pos:(int_of_string line, int_of_string col)
       ~debug
   | [_; "documentSymbol"; path] -> DocumentSymbol.command ~path
-  | [_; "hover"; path; line; col; _currentFile; supportsMarkdownLinks] ->
+  | [_; "hover"; path; line; col; currentFile; supportsMarkdownLinks] ->
     Commands.hover ~path
       ~pos:(int_of_string line, int_of_string col)
-      ~debug
+      ~currentFile ~debug
       ~supportsMarkdownLinks:
         (match supportsMarkdownLinks with
         | "true" -> true

analysis/src/Commands.ml

@@ -11,6 +11,16 @@ let completion ~debug ~path ~pos ~currentFile =
   in
   completions |> Protocol.array |> print_endline
 
+let completionRevamped ~debug ~path ~pos ~currentFile =
+  let completions =
+    match Completions.getCompletionsRevamped ~debug ~path ~pos ~currentFile with
+    | None -> []
+    | Some (completions, full, _) ->
+      completions
+      |> List.map (CompletionBackEnd.completionToItem ~full)
+      |> List.map Protocol.stringifyCompletionItem
+  in
+  completions |> Protocol.array |> print_endline
 let completionResolve ~path ~modulePath =
   (* We ignore the internal module path as of now because there's currently
      no use case for it. But, if we wanted to move resolving documentation
@@ -57,13 +67,22 @@ let codeLens ~path ~debug =
   in
   print_endline result
 
-let hover ~path ~pos ~debug ~supportsMarkdownLinks =
+let hover ~path ~pos ~currentFile ~debug ~supportsMarkdownLinks =
   let result =
     match Cmt.loadFullCmtFromPath ~path with
     | None -> Protocol.null
     | Some full -> (
       match References.getLocItem ~full ~pos ~debug with
-      | None -> Protocol.null
+      | None -> (
+        if debug then
+          Printf.printf
+            "Nothing at that position. Now trying to use completion.\n";
+        match
+          Hover.getHoverViaCompletions ~debug ~path ~pos ~currentFile
+            ~forHover:true ~supportsMarkdownLinks
+        with
+        | None -> Protocol.null
+        | Some hover -> hover)
       | Some locItem -> (
         let isModule =
           match locItem.locType with
@@ -364,6 +383,13 @@ let test ~path =
             let currentFile = createCurrentFile () in
             completion ~debug:true ~path ~pos:(line, col) ~currentFile;
             Sys.remove currentFile
+          | "crm" ->
+            print_endline
+              ("Complete Revamped " ^ path ^ " " ^ string_of_int line ^ ":"
+             ^ string_of_int col);
+            let currentFile = createCurrentFile () in
+            completionRevamped ~debug:true ~path ~pos:(line, col) ~currentFile;
+            Sys.remove currentFile
           | "cre" ->
             let modulePath = String.sub rest 3 (String.length rest - 3) in
             let modulePath = String.trim modulePath in
@@ -388,7 +414,8 @@ let test ~path =
               ("Hover " ^ path ^ " " ^ string_of_int line ^ ":"
              ^ string_of_int col);
             let currentFile = createCurrentFile () in
-            hover ~supportsMarkdownLinks:true ~path ~pos:(line, col) ~debug:true;
+            hover ~supportsMarkdownLinks:true ~path ~pos:(line, col)
+              ~currentFile ~debug:true;
             Sys.remove currentFile
           | "she" ->
             print_endline

analysis/src/CompletionBackEndRevamped.ml

@@ -19,6 +19,7 @@ let findRecordField ~env ~package ~fieldName typ =
     fields |> List.find_opt (fun (field : field) -> field.fname.txt = fieldName)
 
 let completeEmptyPattern ~env ~package typ =
+  prerr_endline (Shared.typeToString typ);
   match TypeUtils.extractType ~env ~package typ with
   | None -> []
   | Some (completionType, typeArgContext) -> (

analysis/src/Completions.ml

@@ -1,5 +1,27 @@
 let getCompletions ~debug ~path ~pos ~currentFile ~forHover =
-  ignore forHover;
+  let textOpt = Files.readFile currentFile in
+  match textOpt with
+  | None | Some "" -> None
+  | Some text -> (
+    match
+      CompletionFrontEnd.completionWithParser ~debug ~path ~posCursor:pos
+        ~currentFile ~text
+    with
+    | None -> None
+    | Some (completable, scope) -> (
+      (* Only perform expensive ast operations if there are completables *)
+      match Cmt.loadFullCmtFromPath ~path with
+      | None -> None
+      | Some full ->
+        let env = SharedTypes.QueryEnv.fromFile full.file in
+        let completables =
+          completable
+          |> CompletionBackEnd.processCompletable ~debug ~full ~pos ~scope ~env
+               ~forHover
+        in
+        Some (completables, full, scope)))
+
+let getCompletionsRevamped ~debug ~path ~pos ~currentFile =
   let textOpt = Files.readFile currentFile in
   match textOpt with
   | None | Some "" -> None

analysis/src/Hover.ml

@@ -245,6 +245,7 @@ let newHover ~full:{file; package} ~supportsMarkdownLinks locItem =
         ~package None)
   | Typed (_, _, Definition (_, (Field _ | Constructor _))) -> None
   | OtherExpression t | OtherPattern t ->
+    (* TODO: Just for debugging. *)
     Some (Markdown.codeBlock (Shared.typeToString t))
   | Constant t ->
     Some

compiler/ml/clflags.ml

@@ -42,7 +42,7 @@ and only_parse = ref false (* -only-parse *)
 
 and ignore_parse_errors = ref false (* -ignore-parse-errors *)
 
-and editor_mode = ref true
+and editor_mode = ref false
 (* -editor-mode *)
 (* true for easy testing *)
 

tests/analysis_tests/tests/src/EnhanceHover.res

@@ -967,5 +967,17 @@ Path ReactDOM.Client.Root.
   }]
 
 Hover src/CompletionInferValues.res 160:27
-null
+Nothing at that position. Now trying to use completion.
+posCursor:[160:27] posNoWhite:[160:26] Found expr:[160:25->160:28]
+Pexp_ident res:[160:25->160:28]
+Completable: Cpath Value[res]
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
+ContextPath Value[res]
+Path res
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
+ContextPath Value[res]
+Path res
+{"contents": {"kind": "markdown", "value": "```rescript\nint\n```"}}