Read autocompleteConfig from rescript.json

Author: fhammerschmidt

analysis/src/CompletionBackEnd.ml

@@ -1136,14 +1136,9 @@ and getCompletionsForContextPath ~debug ~full ~opens ~rawOpens ~pos ~env ~exact
                    else true)
         in
 
-        (* TODO(config-complete-builtins) This config and config resolution should come from `package` instead. *)
-        let pretendPackageBuiltinsConfig =
-          Misc.StringMap.of_list
-            [("array", ["ArrayUtils"]); ("Fastify.t", ["FastifyExt"])]
-        in
         let globallyConfiguredCompletionsForType =
           match
-            pretendPackageBuiltinsConfig |> Misc.StringMap.find_opt mainTypeId
+            package.autocompleteConfig |> Misc.StringMap.find_opt mainTypeId
           with
           | None -> []
           | Some completionPaths ->

analysis/src/Packages.ml

@@ -66,6 +66,28 @@ let newBsPackage ~rootPath =
           | _ -> None)
         | None -> None
       in
+      let autocompleteConfig =
+        match config |> Json.get "editor" with
+        | Some editorConfig -> (
+          match editorConfig |> Json.get "autocompleteConfig" with
+          | Some (Object map) ->
+            map
+            |> List.fold_left
+                 (fun acc (key, value) ->
+                   match value with
+                   | Json.Array items ->
+                     let values =
+                       items
+                       |> List.filter_map (function
+                            | Json.String s -> Some s
+                            | _ -> None)
+                     in
+                     Misc.StringMap.add key values acc
+                   | _ -> acc)
+                 Misc.StringMap.empty
+          | _ -> Misc.StringMap.empty)
+        | None -> Misc.StringMap.empty
+      in
       let uncurried = uncurried = Some true in
       match libBs with
       | None -> None
@@ -158,6 +180,7 @@ let newBsPackage ~rootPath =
              opens;
              namespace;
              uncurried;
+             autocompleteConfig;
            }))
     | None -> None
   in

analysis/src/SharedTypes.ml

@@ -494,6 +494,7 @@ type package = {
   opens: path list;
   uncurried: bool;
   rescriptVersion: int * int;
+  autocompleteConfig: file list Misc.StringMap.t;
 }
 
 let allFilesInPackage package =