always use new stdlib modules for autocomplete

Author: zth

analysis/src/CompletionBackEnd.ml

@@ -1090,8 +1090,7 @@ and getCompletionsForContextPath ~debug ~full ~opens ~rawOpens ~pos ~env ~exact
           *)
           let completeAsBuiltin =
             match typePath with
-            | Some t ->
-              TypeUtils.completionPathFromMaybeBuiltin t ~package:full.package
+            | Some t -> TypeUtils.completionPathFromMaybeBuiltin t
             | None -> None
           in
           let completionPath =
@@ -1801,8 +1800,7 @@ let rec completeTypedValue ?(typeArgContext : typeArgContext option) ~rawOpens
     if Debug.verbose () then print_endline "[complete_typed_value]--> Texn";
     [
       create
-        (full.package.builtInCompletionModules.exnModulePath @ ["Error(error)"]
-        |> ident)
+        (["Exn.t"; "Error(error)"] |> ident)
         ~kind:(Label "Catches errors from JavaScript errors.")
         ~docstring:
           [

analysis/src/Packages.ml

@@ -148,61 +148,6 @@ let newBsPackage ~rootPath =
              pathsForModule;
              opens;
              namespace;
-             builtInCompletionModules =
-               (if
-                  opens_from_bsc_flags
-                  |> List.find_opt (fun opn ->
-                         match opn with
-                         | ["RescriptCore"] -> true
-                         | _ -> false)
-                  |> Option.is_some
-                  || fst rescriptVersion >= 12
-                then
-                  {
-                    arrayModulePath = ["Array"];
-                    optionModulePath = ["Option"];
-                    stringModulePath = ["String"];
-                    intModulePath = ["Int"];
-                    floatModulePath = ["Float"];
-                    promiseModulePath = ["Promise"];
-                    listModulePath = ["List"];
-                    resultModulePath = ["Result"];
-                    exnModulePath = ["Exn"];
-                    regexpModulePath = ["RegExp"];
-                  }
-                else if
-                  opens_from_bsc_flags
-                  |> List.find_opt (fun opn ->
-                         match opn with
-                         | ["Belt"] -> true
-                         | _ -> false)
-                  |> Option.is_some
-                then
-                  {
-                    arrayModulePath = ["Array"];
-                    optionModulePath = ["Option"];
-                    stringModulePath = ["Js"; "String2"];
-                    intModulePath = ["Int"];
-                    floatModulePath = ["Float"];
-                    promiseModulePath = ["Js"; "Promise"];
-                    listModulePath = ["List"];
-                    resultModulePath = ["Result"];
-                    exnModulePath = ["Js"; "Exn"];
-                    regexpModulePath = ["Js"; "Re"];
-                  }
-                else
-                  {
-                    arrayModulePath = ["Js"; "Array2"];
-                    optionModulePath = ["Belt"; "Option"];
-                    stringModulePath = ["Js"; "String2"];
-                    intModulePath = ["Belt"; "Int"];
-                    floatModulePath = ["Belt"; "Float"];
-                    promiseModulePath = ["Js"; "Promise"];
-                    listModulePath = ["Belt"; "List"];
-                    resultModulePath = ["Belt"; "Result"];
-                    exnModulePath = ["Js"; "Exn"];
-                    regexpModulePath = ["Js"; "Re"];
-                  });
              uncurried;
            }))
     | None -> None

analysis/src/SharedTypes.ml

@@ -483,19 +483,6 @@ type file = string
 
 module FileSet = Set.Make (String)
 
-type builtInCompletionModules = {
-  arrayModulePath: string list;
-  optionModulePath: string list;
-  stringModulePath: string list;
-  intModulePath: string list;
-  floatModulePath: string list;
-  promiseModulePath: string list;
-  listModulePath: string list;
-  resultModulePath: string list;
-  exnModulePath: string list;
-  regexpModulePath: string list;
-}
-
 type package = {
   genericJsxModule: string option;
   suffix: string;
@@ -504,7 +491,6 @@ type package = {
   dependenciesFiles: FileSet.t;
   pathsForModule: (file, paths) Hashtbl.t;
   namespace: string option;
-  builtInCompletionModules: builtInCompletionModules;
   opens: path list;
   uncurried: bool;
   rescriptVersion: int * int;

analysis/src/TypeUtils.ml

@@ -1253,17 +1253,16 @@ let pathToBuiltin path =
   Predef.builtin_idents
   |> List.find_opt (fun (_, i) -> Ident.same i (Path.head path))
 
-let completionPathFromMaybeBuiltin path ~package =
+let completionPathFromMaybeBuiltin path =
   match pathToBuiltin path with
-  | Some ("array", _) -> Some package.builtInCompletionModules.arrayModulePath
-  | Some ("option", _) -> Some package.builtInCompletionModules.optionModulePath
-  | Some ("string", _) -> Some package.builtInCompletionModules.stringModulePath
-  | Some ("int", _) -> Some package.builtInCompletionModules.intModulePath
-  | Some ("float", _) -> Some package.builtInCompletionModules.floatModulePath
-  | Some ("promise", _) ->
-    Some package.builtInCompletionModules.promiseModulePath
-  | Some ("list", _) -> Some package.builtInCompletionModules.listModulePath
-  | Some ("result", _) -> Some package.builtInCompletionModules.resultModulePath
+  | Some ("array", _) -> Some ["Array"]
+  | Some ("option", _) -> Some ["Option"]
+  | Some ("string", _) -> Some ["String"]
+  | Some ("int", _) -> Some ["Int"]
+  | Some ("float", _) -> Some ["Float"]
+  | Some ("promise", _) -> Some ["Promise"]
+  | Some ("list", _) -> Some ["List"]
+  | Some ("result", _) -> Some ["Result"]
   | Some ("dict", _) -> Some ["Dict"]
   | Some ("char", _) -> Some ["Char"]
   | _ -> None

tests/analysis_tests/tests/src/Completion.res

@@ -389,7 +389,6 @@ let _ = x =>
 //                      ^com
 
 let _ = _ => {
-  open Js
   //  []->ma
   //        ^com
   ()