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

@@ -966,5 +966,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```"}}
 

tests/analysis_tests/tests/src/expected/Completion.res.txt

@@ -2,5 +2,9 @@ Hover src/Fragment.res 6:19
 {"contents": {"kind": "markdown", "value": "```rescript\nReact.component<SectionHeader.props<React.element>>\n```\n\n---\n\n```\n \n```\n```rescript\ntype React.component<'props> = Jsx.component<'props>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22React.res%22%2C12%2C0%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype SectionHeader.props<'children> = {children: 'children}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Fragment.res%22%2C1%2C2%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype React.element = Jsx.element\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22React.res%22%2C0%2C0%5D)\n"}}
 
 Hover src/Fragment.res 9:56
-{"contents": {"kind": "markdown", "value": "```rescript\nReact.element\n```"}}
+Nothing at that position. Now trying to use completion.
+posCursor:[9:56] posNoWhite:[9:55] Found expr:[9:9->9:70]
+posCursor:[9:56] posNoWhite:[9:55] Found expr:[9:12->9:66]
+JSX <SectionHeader:[9:13->9:26] > _children:9:29
+null
 

tests/analysis_tests/tests/src/expected/CompletionInferValues.res.txt

@@ -49,10 +49,16 @@ Hover src/Hover.res 77:7
 {"contents": {"kind": "markdown", "value": "```rescript\nmodule A: {\n  let x: int\n}\n```"}}
 
 Hover src/Hover.res 91:10
+Nothing at that position. Now trying to use completion.
+posCursor:[91:10] posNoWhite:[91:8] Found expr:[88:2->91:9]
+JSX <Comp:[88:3->88:7] > _children:89:4
 null
 
 Hover src/Hover.res 98:10
-{"contents": {"kind": "markdown", "value": "```rescript\nReact.element\n```"}}
+Nothing at that position. Now trying to use completion.
+posCursor:[98:10] posNoWhite:[98:9] Found expr:[95:2->98:10]
+JSX <Comp1:[95:3->95:8] > _children:96:4
+null
 
 Hover src/Hover.res 103:25
 {"contents": {"kind": "markdown", "value": "```rescript\nfloat\n```"}}
@@ -67,7 +73,12 @@ Hover src/Hover.res 119:25
 {"contents": {"kind": "markdown", "value": "```rescript\nAA.cond<([< #str(string)] as 'a)> => AA.cond<'a>\n```\n\n---\n\n```\n \n```\n```rescript\ntype AA.cond<'a> = 'a\n  constraint 'a = [< #str(string)]\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Hover.res%22%2C110%2C2%5D)\n"}}
 
 Hover src/Hover.res 122:3
-null
+Nothing at that position. Now trying to use completion.
+Attribute id:live:[122:0->122:5] label:live
+Completable: Cdecorator(live)
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
+{"contents": {"kind": "markdown", "value": "The `@live` decorator is for reanalyze, a static analysis tool for ReScript that can do dead code analysis.\n\n`@live` tells the dead code analysis that the value should be considered live, even though it might appear to be dead. This is typically used in case of FFI where there are indirect ways to access values. It can be added to everything that could otherwise be considered unused by the dead code analysis - values, functions, arguments, records, individual record fields, and so on.\n\n[Read more and see examples in the documentation](https://rescript-lang.org/syntax-lookup#live-decorator).\n\nHint: Did you know you can run an interactive code analysis in your project by running the command `> ReScript: Start Code Analyzer`? Try it!"}}
 
 Hover src/Hover.res 125:4
 {"contents": {"kind": "markdown", "value": "```rescript\nunit => unit => int\n```"}}
@@ -88,10 +99,10 @@ Hover src/Hover.res 148:6
 {"contents": {"kind": "markdown", "value": "```rescript\nint\n```\n---\n doc comment 2 "}}
 
 Hover src/Hover.res 165:23
-{"contents": {"kind": "markdown", "value": "```rescript\nfoo<bar>\n```\n\n---\n\n```\n \n```\n```rescript\ntype foo<'a> = {content: 'a, zzz: string}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Hover.res%22%2C161%2C2%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype bar = {age: int}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Hover.res%22%2C162%2C2%5D)\n"}}
+{"contents": {"kind": "markdown", "value": "```rescript\nfoo<bar>\n```"}}
 
 Hover src/Hover.res 167:22
-{"contents": {"kind": "markdown", "value": "```rescript\nfoobar\n```\n\n---\n\n```\n \n```\n```rescript\ntype foobar = foo<bar>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Hover.res%22%2C163%2C2%5D)\n"}}
+{"contents": {"kind": "markdown", "value": "```rescript\nfoobar\n```"}}
 
 Complete src/Hover.res 170:16
 posCursor:[170:16] posNoWhite:[170:15] Found expr:[170:5->170:16]
@@ -236,7 +247,17 @@ Hover src/Hover.res 202:16
 {"contents": {"kind": "markdown", "value": "```rescript\nuseR\n```"}}
 
 Hover src/Hover.res 210:13
-null
+Nothing at that position. Now trying to use completion.
+posCursor:[210:13] posNoWhite:[210:12] Found expr:[210:11->210:14]
+Pexp_ident usr:[210:11->210:14]
+Completable: Cpath Value[usr]
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
+ContextPath Value[usr]
+Path usr
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
+{"contents": {"kind": "markdown", "value": "```rescript\nuseR\n```\n\n---\n\n```\n \n```\n```rescript\ntype useR = {x: int, y: list<option<r<float>>>}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Hover.res%22%2C200%2C0%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype r<'a> = {i: 'a, f: float}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Hover.res%22%2C101%2C0%5D)\n"}}
 
 Hover src/Hover.res 230:20
 {"contents": {"kind": "markdown", "value": "```rescript\nint\n```\n---\n More Stuff "}}
@@ -245,7 +266,23 @@ Hover src/Hover.res 233:17
 {"contents": {"kind": "markdown", "value": "```rescript\nint\n```\n---\n More Stuff "}}
 
 Hover src/Hover.res 245:6
-null
+Nothing at that position. Now trying to use completion.
+posCursor:[245:6] posNoWhite:[245:5] Found expr:[245:3->245:14]
+Pexp_field [245:3->245:4] someField:[245:5->245:14]
+Completable: Cpath Value[x].someField
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
+ContextPath Value[x].someField
+ContextPath Value[x]
+Path x
+ContextPath Value[x]->someField
+ContextPath Value[x]
+Path x
+CPPipe pathFromEnv: found:true
+Path Hover.someField
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
+{"contents": {"kind": "markdown", "value": " Mighty fine field here. \n\n```rescript\nbool\n```"}}
 
 Hover src/Hover.res 248:19
 {"contents": {"kind": "markdown", "value": "```rescript\nbool\n```\n---\n Mighty fine field here. "}}
@@ -254,10 +291,34 @@ Hover src/Hover.res 253:20
 {"contents": {"kind": "markdown", "value": "```rescript\nvariant\n```\n\n---\n\n```\n \n```\n```rescript\ntype variant = CoolVariant | OtherCoolVariant\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Hover.res%22%2C251%2C0%5D)\n\n---\n```rescript\nCoolVariant\n```\n---\n Cool variant! "}}
 
 Hover src/Hover.res 257:23
-null
+Nothing at that position. Now trying to use completion.
+posCursor:[257:23] posNoWhite:[257:22] Found expr:[257:22->257:25]
+Pexp_ident fff:[257:22->257:25]
+Completable: Cpath Value[fff]
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
+ContextPath Value[fff]
+Path fff
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
+ContextPath string
+{"contents": {"kind": "markdown", "value": "```rescript\nstring\n```"}}
 
 Hover src/Hover.res 260:33
-null
+Nothing at that position. Now trying to use completion.
+posCursor:[260:33] posNoWhite:[260:32] Found expr:[260:31->260:40]
+Pexp_ident someField:[260:31->260:40]
+Completable: Cpath Value[someField]
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
+ContextPath Value[someField]
+Path someField
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
+ContextPath CPatternPath(Value[x])->recordField(someField)
+ContextPath Value[x]
+Path x
+{"contents": {"kind": "markdown", "value": "```rescript\nbool\n```"}}
 
 Hover src/Hover.res 263:8
 {"contents": {"kind": "markdown", "value": "\n [`Belt.Array`]()\n\n  **mutable array**: Utilities functions\n\n```rescript\nmodule Array: {\n  module Id\n  module Array\n  module SortArray\n  module MutableQueue\n  module MutableStack\n  module List\n  module Range\n  module Set\n  module Map\n  module MutableSet\n  module MutableMap\n  module HashSet\n  module HashMap\n  module Option\n  module Result\n  module Int\n  module Float\n}\n```"}}

tests/analysis_tests/tests/src/expected/EnhanceHover.res.txt

@@ -1,17 +1,5 @@
 Inlay Hint src/InlayHint.res 1:34
 [{
-    "position": {"line": 33, "character": 14},
-    "label": ": int",
-    "kind": 1,
-    "paddingLeft": true,
-    "paddingRight": false
-}, {
-    "position": {"line": 33, "character": 9},
-    "label": ": string",
-    "kind": 1,
-    "paddingLeft": true,
-    "paddingRight": false
-}, {
     "position": {"line": 28, "character": 9},
     "label": ": foo",
     "kind": 1,

tests/analysis_tests/tests/src/expected/Fragment.res.txt

@@ -373,17 +373,7 @@ Package opens Stdlib.place holder Pervasives.JsxModules.place holder
 Resolved opens 1 Stdlib
 ContextPath Type[ReactDOMR]
 Path ReactDOMR
-[{
-    "label": "ReactDOMRe",
-    "kind": 9,
-    "tags": [],
-    "detail": "module ReactDOMRe",
-    "documentation": null,
-    "data": {
-      "modulePath": "ReactDOMRe",
-      "filePath": "src/Jsx2.res"
-    }
-  }]
+[]
 
 Complete src/Jsx2.res 102:21
 posCursor:[102:21] posNoWhite:[102:20] Found expr:[102:13->102:21]
@@ -527,8 +517,8 @@ Path Nested.
   }]
 
 Hover src/Jsx2.res 162:12
-{"contents": {"kind": "markdown", "value": "```rescript\nReact.element\n```"}}
+{"contents": {"kind": "markdown", "value": "```rescript\nComp.props<int>\n```\n\n---\n\n```\n \n```\n```rescript\ntype Comp.props<'age> = {age: 'age}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Jsx2.res%22%2C157%2C2%5D)\n"}}
 
 Hover src/Jsx2.res 167:16
-{"contents": {"kind": "markdown", "value": "```rescript\nReact.element\n```"}}
+{"contents": {"kind": "markdown", "value": "```rescript\nComp.props<int>\n```\n\n---\n\n```\n \n```\n```rescript\ntype Comp.props<'age> = {age: 'age}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Jsx2.res%22%2C157%2C2%5D)\n"}}