handle nopervasives, and open Stdlib by default

Author: zth

analysis/src/Packages.ml

@@ -115,26 +115,35 @@ let newBsPackage ~rootPath =
                let path = [FindFiles.nameSpaceToName namespace] in
                [path]
            in
+           let bind f x = Option.bind x f in
+           let bsc_flags =
+             Json.get "bsc-flags" config
+             |> bind Json.array |> Option.value ~default:[]
+           in
+           let no_pervasives =
+             bsc_flags
+             |> List.exists (fun s -> Json.string s = Some "-nopervasives")
+           in
            let opens_from_bsc_flags =
-             let bind f x = Option.bind x f in
-             match Json.get "bsc-flags" config |> bind Json.array with
-             | Some l ->
-               List.fold_left
-                 (fun opens item ->
-                   match item |> Json.string with
-                   | None -> opens
-                   | Some s -> (
-                     let parts = String.split_on_char ' ' s in
-                     match parts with
-                     | "-open" :: name :: _ ->
-                       let path = name |> String.split_on_char '.' in
-                       path :: opens
-                     | _ -> opens))
-                 [] l
-             | None -> []
+             List.fold_left
+               (fun opens item ->
+                 match item |> Json.string with
+                 | None -> opens
+                 | Some s -> (
+                   let parts = String.split_on_char ' ' s in
+                   match parts with
+                   | "-open" :: name :: _ ->
+                     let path = name |> String.split_on_char '.' in
+                     path :: opens
+                   | _ -> opens))
+               [] bsc_flags
+           in
+           let opens_from_pervasives =
+             if no_pervasives then []
+             else [["Stdlib"]; ["Pervasives"; "JsxModules"]]
            in
            let opens =
-             ["Pervasives"; "JsxModules"] :: opens_from_namespace
+             opens_from_pervasives @ opens_from_namespace
              |> List.rev_append opens_from_bsc_flags
              |> List.map (fun path -> path @ ["place holder"])
            in

tests/analysis_tests/tests-incremental-typechecking/src/expected/ConstructorCompletion__Json.res.txt

@@ -4,14 +4,13 @@ Pexp_construct Js
 Json
 Array:[0:8->0:21] [0:21->0:23]
 Completable: Cexpression CTypeAtPos()->variantPayload::Array($0)
-Package opens Pervasives.JsxModules.place holder
 ContextPath CTypeAtPos()
 [{
     "label": "[]",
     "kind": 12,
     "tags": [],
     "detail": "t",
-    "documentation": {"kind": "markdown", "value": " The JSON data structure \n\n```rescript\n@unboxed\ntype t =\n  | Boolean(bool)\n  | @as(null) Null\n  | String(string)\n  | Number(float)\n  | Object(dict<t>)\n  | Array(array<t>)\n```"},
+    "documentation": {"kind": "markdown", "value": " \nA type representing a JSON object.\n\n\n```rescript\n@unboxed\ntype t =\n  | Boolean(bool)\n  | @as(null) Null\n  | String(string)\n  | Number(float)\n  | Object(dict<t>)\n  | Array(array<t>)\n```"},
     "sortText": "A",
     "insertText": "[$0]",
     "insertTextFormat": 2

tests/analysis_tests/tests-incremental-typechecking/src/expected/ConstructorCompletion__Own.res.txt

@@ -3,7 +3,6 @@ posCursor:[4:24] posNoWhite:[4:23] Found expr:[4:8->4:25]
 Pexp_construct WithVariant
 One:[4:8->4:23] [4:23->4:25]
 Completable: Cexpression CTypeAtPos()->variantPayload::One($0)
-Package opens Pervasives.JsxModules.place holder
 ContextPath CTypeAtPos()
 [{
     "label": "{}",

tests/analysis_tests/tests/bsconfig.json tests/analysis_tests/tests/rescript.json

@@ -2,15 +2,17 @@ Complete src/BrokenParserCases.res 2:24
 posCursor:[2:24] posNoWhite:[2:23] Found expr:[2:11->2:30]
 Pexp_apply ...[2:11->2:17] (~isOff2:19->2:24=...[2:27->2:29])
 Completable: CnamedArg(Value[someFn], isOff, [isOff])
-Package opens Pervasives.JsxModules.place holder
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
 ContextPath Value[someFn]
 Path someFn
 []
 
 Complete src/BrokenParserCases.res 6:17
 posCursor:[6:17] posNoWhite:[6:16] Found pattern:[6:16->6:19]
 Completable: Cpattern Value[s]=t
-Package opens Pervasives.JsxModules.place holder
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
 ContextPath Value[s]
 Path s
 []
@@ -20,7 +22,8 @@ posCursor:[10:29] posNoWhite:[10:27] Found pattern:[10:24->10:39]
 posCursor:[10:29] posNoWhite:[10:27] Found pattern:[10:24->10:28]
 Ppat_construct None:[10:24->10:28]
 Completable: Cpath Value[None]
-Package opens Pervasives.JsxModules.place holder
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
 ContextPath Value[None]
 Path None
 []

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

@@ -1,7 +1,8 @@
 Complete src/CompletePrioritize1.res 6:6
 posCursor:[6:6] posNoWhite:[6:5] Found expr:[6:3->0:-1]
 Completable: Cpath Value[a]->
-Package opens Pervasives.JsxModules.place holder
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
 ContextPath Value[a]->
 ContextPath Value[a]
 Path a

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

@@ -1,7 +1,8 @@
 Complete src/CompletePrioritize2.res 9:7
 posCursor:[9:7] posNoWhite:[9:6] Found expr:[9:3->0:-1]
 Completable: Cpath Value[ax]->
-Package opens Pervasives.JsxModules.place holder
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
 ContextPath Value[ax]->
 ContextPath Value[ax]
 Path ax
@@ -19,7 +20,8 @@ Complete src/CompletePrioritize2.res 12:5
 posCursor:[12:5] posNoWhite:[12:4] Found expr:[12:3->12:5]
 Pexp_ident ax:[12:3->12:5]
 Completable: Cpath Value[ax]
-Package opens Pervasives.JsxModules.place holder
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
 ContextPath Value[ax]
 Path ax
 [{