use config to activate new engine

Author: zth

analysis/bin/main.ml

@@ -129,14 +129,14 @@ let main () =
     | _ -> print_endline "\"ERR: Did not find root \"")
   | [_; "completion"; path; line; col; currentFile] ->
     printHeaderInfo path line col;
-    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
+    if !Cfg.useRevampedCompletion then
+      Commands.completionRevamped ~debug ~path
+        ~pos:(int_of_string line, int_of_string col)
+        ~currentFile
+    else
+      Commands.completion ~debug ~path
+        ~pos:(int_of_string line, int_of_string col)
+        ~currentFile
   | [_; "completionResolve"; path; modulePath] ->
     Commands.completionResolve ~path ~modulePath
   | [_; "definition"; path; line; col] ->
@@ -216,6 +216,7 @@ let main () =
   | [_; "test"; path] -> Commands.test ~path
   | [_; "test_revamped"; path; config_file_path] ->
     Packages.overrideConfigFilePath := Some config_file_path;
+    Cfg.useRevampedCompletion := true;
     Commands.test ~path
   | args when List.mem "-h" args || List.mem "--help" args -> prerr_endline help
   | _ ->

analysis/src/Cfg.ml

@@ -17,3 +17,6 @@ let readProjectConfigCache =
        | "true" -> true
        | _ -> false
      with _ -> false)
+
+let useRevampedCompletion =
+  ref (Sys.getenv_opt "RESCRIPT_NEW_ANALYSIS_ENGINE" |> Option.is_some)

analysis/src/Commands.ml

@@ -73,6 +73,7 @@ let hover ~path ~pos ~currentFile ~debug ~supportsMarkdownLinks =
     | None -> Protocol.null
     | Some full -> (
       match References.getLocItem ~full ~pos ~debug with
+      | None when !Cfg.useRevampedCompletion -> Protocol.null
       | None -> (
         if debug then
           Printf.printf
@@ -381,14 +382,9 @@ let test ~path =
               ("Complete " ^ path ^ " " ^ string_of_int line ^ ":"
              ^ string_of_int col);
             let currentFile = createCurrentFile () in
-            completion ~debug:true ~path ~pos:(line, col) ~currentFile;
-            Sys.remove currentFile
-          | "crm" ->
-            print_endline
-              ("Complete " ^ path ^ " " ^ string_of_int line ^ ":"
-             ^ string_of_int col);
-            let currentFile = createCurrentFile () in
-            completionRevamped ~debug:true ~path ~pos:(line, col) ~currentFile;
+            if !Cfg.useRevampedCompletion then
+              completionRevamped ~debug:true ~path ~pos:(line, col) ~currentFile
+            else completion ~debug:true ~path ~pos:(line, col) ~currentFile;
             Sys.remove currentFile
           | "cre" ->
             let modulePath = String.sub rest 3 (String.length rest - 3) in

analysis/src/Hover.ml

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

tests/analysis_new_tests/tests/test_files/RecordFieldCompletions.res

@@ -1,7 +1,7 @@
 // == TEST: Record field completion in nested record
 let x = TestTypeDefs.nestedTestRecord.
-//                                    ^crm
+//                                    ^com
 
 // == TEST: Record field completion in nested record, another level
 let x = TestTypeDefs.nestedTestRecord.nested.
-//                                           ^crm
+//                                           ^com

tests/analysis_new_tests/tests/test_files/SwitchCaseCompletions.res

@@ -3,17 +3,17 @@ let someStringArr = ["hello"]
 
 let x = switch someStringArr {
   | 
-//  ^crm
+//  ^com
 }
 
 // == TEST: Empty case, record
 let x = switch TestTypeDefs.nestedTestRecord {
   | 
-//  ^crm
+//  ^com
 }
 
 // == TEST: Empty case, bool
 let x = switch true {
   | 
-//  ^crm
+//  ^com
 }