Merge branch 'master' into application-completion

Author: nojaf

.devcontainer/postCreate.sh

@@ -2,7 +2,7 @@
 
 # Install dev dependencies from OPAM
 opam init -y --bare --disable-sandboxing
-opam switch create 5.2.1 --packages ocaml-option-static
+opam switch create 5.3.0 --packages ocaml-option-static
 opam install . --deps-only -y
 
 # For IDE support, install the OCaml language server

.github/workflows/ci.yml

@@ -87,32 +87,34 @@ jobs:
       matrix:
         include:
           - os: ubuntu-24.04 # x64
-            ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static
+            ocaml_compiler: ocaml-variants.5.3.0+options,ocaml-option-static
             upload_binaries: true
             upload_libs: true
           - os: ubuntu-24.04-arm # ARM
-            ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static
+            ocaml_compiler: ocaml-variants.5.3.0+options,ocaml-option-static
             upload_binaries: true
             # Build the playground compiler and run the benchmarks on the fastest runner
             build_playground: true
             benchmarks: true
           - os: macos-13 # x64
-            ocaml_compiler: 5.2.1
+            ocaml_compiler: 5.3.0
             upload_binaries: true
           - os: macos-14 # ARM
-            ocaml_compiler: 5.2.1
+            ocaml_compiler: 5.3.0
             upload_binaries: true
           - os: windows-latest
-            ocaml_compiler: 5.2.1
+            ocaml_compiler: 5.3.0
             upload_binaries: true
 
           # Verify that the compiler still builds with older OCaml versions
+          - os: ubuntu-24.04
+            ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static
+            # Reanalyze does not work on OCaml 5.3.0 anymore, therefore run it on 5.2.1
+            run_reanalyze: true
           - os: ubuntu-24.04
             ocaml_compiler: ocaml-variants.5.0.0+options,ocaml-option-static
           - os: ubuntu-24.04
             ocaml_compiler: ocaml-variants.4.14.2+options,ocaml-option-static
-          - os: ubuntu-24.04
-            ocaml_compiler: ocaml-variants.4.13.0+options,ocaml-option-static
 
     runs-on: ${{matrix.os}}
 
@@ -151,7 +153,7 @@ jobs:
       # matrix.ocaml_compiler may contain commas
       - name: Get OPAM cache key
         shell: bash
-        run: echo "opam_cache_key=opam-env-v6-${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('dune-project') }}" | sed 's/,/-/g' >> $GITHUB_ENV
+        run: echo "opam_cache_key=opam-env-v7-${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('dune-project') }}" | sed 's/,/-/g' >> $GITHUB_ENV
 
       - name: Restore OPAM environment
         id: cache-opam-env
@@ -189,6 +191,10 @@ jobs:
         if: steps.cache-opam-env.outputs.cache-hit != 'true'
         run: opam install . --deps-only --with-test
 
+      - name: "Install reanalyze"
+        if: steps.cache-opam-env.outputs.cache-hit != 'true' && matrix.run_reanalyze
+        run: opam install reanalyze
+
       - name: Cache OPAM environment
         if: steps.cache-opam-env.outputs.cache-hit != 'true'
         uses: actions/cache/save@v4
@@ -299,6 +305,10 @@ jobs:
         if: ${{ runner.os == 'Windows' }}
         run: opam exec -- make test-syntax
 
+      - name: "Syntax: Run reanalyze"
+        if: matrix.run_reanalyze
+        run: opam exec -- make reanalyze
+
       - name: Build runtime/stdlib
         run: ./scripts/buildRuntime.sh
         shell: bash
@@ -316,7 +326,7 @@ jobs:
         run: git diff --ignore-cr-at-eol --exit-code tests
 
       - name: Run analysis / tools tests
-        if: runner.os != 'Windows' && matrix.os != 'ubuntu-24.04-arm'
+        if: runner.os != 'Windows' && runner.os != 'Linux'
         run: opam exec -- make -C tests/analysis_tests test && make -C tests/tools_tests test
 
       - name: Run gentype tests

.ocamlformat

@@ -1,5 +1,5 @@
 profile = default
-version = 0.26.2
+version = 0.27.0
 
 field-space = tight-decl
 break-cases = toplevel
@@ -9,3 +9,4 @@ space-around-arrays = false
 space-around-lists = false
 space-around-records = false
 space-around-variants = false
+parse-docstrings = false

CHANGELOG.md

@@ -12,9 +12,16 @@
 
 # 12.0.0-alpha.9 (Unreleased)
 
+#### :boom: Breaking Change
+
+- Clean list API. https://github.com/rescript-lang/rescript/pull/7290
+
 #### :nail_care: Polish
 
 - Allow single newline in JSX. https://github.com/rescript-lang/rescript/pull/7269
+- Editor: Always complete from Core first. Use actual native regex syntax in code snippets for regexps. https://github.com/rescript-lang/rescript/pull/7295
+- Add `type t` to Stdlib modules. https://github.com/rescript-lang/rescript/pull/7302
+- Gentype: handle null/nullable/undefined from Stdlib. https://github.com/rescript-lang/rescript/pull/7132
 
 #### :bug: Bug fix
 
@@ -24,11 +31,17 @@
 - Fix completion for application with tagged template. https://github.com/rescript-lang/rescript/pull/7278
 - Fix error message for arity in the presence of optional arguments. https://github.com/rescript-lang/rescript/pull/7284
 - Fix issue in functors with more than one argument (which are curried): emit nested function always. https://github.com/rescript-lang/rescript/pull/7273
-- Fix dot completion issue with React primitives.  https://github.com/rescript-lang/rescript/pull/7292
+- Fix dot completion issue with React primitives. https://github.com/rescript-lang/rescript/pull/7292
+- Stdlib namespace for Core modules (fixes name clashes with user modules). https://github.com/rescript-lang/rescript/pull/7285
+- Fix runtime type check for Object in untagged variants when one variant case is `null`. https://github.com/rescript-lang/rescript/pull/7303
+- Fix files that were being truncated when sent to the CDN over FTP. https://github.com/rescript-lang/rescript/pull/7306
 
 #### :house: Internal
 
 - Remove ignore in res_scanner.ml . https://github.com/rescript-lang/rescript/pull/7280
+- Use the new stdlib modules in the analysis tests. https://github.com/rescript-lang/rescript/pull/7295
+- Build with OCaml 5.3.0. https://github.com/rescript-lang/rescript/pull/7294
+- Simplify JSON.Decode implementation. https://github.com/rescript-lang/rescript/pull/7304
 
 # 12.0.0-alpha.8
 

CONTRIBUTING.md

@@ -47,7 +47,7 @@ Make sure you have [opam](https://opam.ocaml.org/doc/Install.html) installed on
 opam init
 
 # Any recent OCaml version works as a development compiler
-opam switch create 5.2.1 # can also create local switch with opam switch create
+opam switch create 5.3.0 # can also create local switch with opam switch create
 
 # Install dev dependencies from OPAM
 opam install . --deps-only --with-test --with-dev-setup -y

Makefile

@@ -40,12 +40,10 @@ test-tools:
 
 test-syntax:
 	bash ./scripts/test_syntax.sh
-	make reanalyze
 	bash ./scripts/testok.sh
 
 test-syntax-roundtrip:
 	ROUNDTRIP_TEST=1 bash ./scripts/test_syntax.sh
-	make reanalyze
 	bash ./scripts/testok.sh
 
 test-gentype:

analysis.opam

@@ -7,8 +7,8 @@ license: "LGPL-3.0-or-later"
 homepage: "https://github.com/rescript-lang/rescript-compiler"
 bug-reports: "https://github.com/rescript-lang/rescript-compiler/issues"
 depends: [
-  "ocaml" {>= "4.10"}
-  "cppo" {= "1.6.9"}
+  "ocaml" {>= "4.14"}
+  "cppo" {= "1.8.0"}
   "dune"
 ]
 build: [

analysis/reanalyze/src/DeadCommon.ml

@@ -555,7 +555,8 @@ module Decl = struct
         let refIsBelow (pos : Lexing.position) =
           decl.pos.pos_fname <> pos.pos_fname
           || decl.pos.pos_cnum < pos.pos_cnum
-             && (* not a function defined inside a function, e.g. not a callback *)
+             &&
+             (* not a function defined inside a function, e.g. not a callback *)
              decl.posEnd.pos_cnum < pos.pos_cnum
         in
         refs |> PosSet.exists refIsBelow

analysis/src/CompletionBackEnd.ml

@@ -1096,8 +1096,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 =
@@ -1458,9 +1457,11 @@ let rec completeTypedValue ?(typeArgContext : typeArgContext option) ~rawOpens
     (* Special casing for things where we want extra things in the completions *)
     let completionItems =
       match path with
-      | Pdot (Pdot (Pident m, "Re", _), "t", _) when Ident.name m = "Js" ->
+      | Pdot (Pdot (Pident {name = "Js"}, "Re", _), "t", _)
+      | Pdot (Pdot (Pident {name = "Stdlib"}, "RegExp", _), "t", _)
+      | Pdot (Pident {name = "RegExp"}, "t", _) ->
         (* regexps *)
-        create "%re()" ~insertText:"%re(\"/$0/g\")" ~includesSnippets:true
+        create "/<regexp>/g" ~insertText:"/$0/g" ~includesSnippets:true
           ~kind:(Label "Regular expression") ~env
         :: completionItems
       | _ -> completionItems
@@ -1807,8 +1808,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"; "Error(error)"] |> ident)
         ~kind:(Label "Catches errors from JavaScript errors.")
         ~docstring:
           [
@@ -2250,12 +2250,7 @@ let rec processCompletable ~debug ~full ~scope ~env ~pos ~forHover completable =
         | _ -> items)))
   | CexhaustiveSwitch {contextPath; exprLoc} ->
     let range = Utils.rangeOfLoc exprLoc in
-    let rescriptMajor, rescriptMinor = Packages.getReScriptVersion () in
-    let printFailwithStr num =
-      if (rescriptMajor = 11 && rescriptMinor >= 1) || rescriptMajor >= 12 then
-        "${" ^ string_of_int num ^ ":%todo}"
-      else "${" ^ string_of_int num ^ ":failwith(\"todo\")}"
-    in
+    let printFailwithStr num = "${" ^ string_of_int num ^ ":%todo}" in
     let withExhaustiveItem ~cases ?(startIndex = 0) (c : Completion.t) =
       (* We don't need to write out `switch` here since we know that's what the
          user has already written. Just complete for the rest. *)

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
@@ -148,61 +157,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