Merge branch 'master' into pipe-include-module-two

Author: nojaf

.github/workflows/ci.yml

@@ -137,32 +137,32 @@ jobs:
         shell: bash
 
       # matrix.ocaml_compiler may contain commas
-      # - name: Get OPAM cache key
-      #   shell: bash
-      #   run: echo "opam_cache_key=opam-env-v8-${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('*.opam') }}" | sed 's/,/-/g' >> $GITHUB_ENV
+      - name: Get OPAM cache key
+        shell: bash
+        run: echo "opam_cache_key=opam-env-v8-${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('*.opam') }}" | sed 's/,/-/g' >> $GITHUB_ENV
 
-      # - name: Restore OPAM environment
-      #   id: cache-opam-env
-      #   uses: actions/cache/restore@v4
-      #   with:
-      #     path: |
-      #       ${{ runner.tool_cache }}/opam
-      #       ~/.opam
-      #       _opam
-      #       .opam-path
-      #       D:\cygwin
-      #       D:\.opam
-      #     key: ${{ env.opam_cache_key }}
+      - name: Restore OPAM environment
+        id: cache-opam-env
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            ${{ runner.tool_cache }}/opam
+            ~/.opam
+            _opam
+            .opam-path
+            D:\cygwin
+            D:\.opam
+          key: ${{ env.opam_cache_key }}
 
       - name: Use OCaml ${{matrix.ocaml_compiler}}
         uses: ocaml/[email protected]
-        # if: steps.cache-opam-env.outputs.cache-hit != 'true'
+        if: steps.cache-opam-env.outputs.cache-hit != 'true'
         with:
           ocaml-compiler: ${{matrix.ocaml_compiler}}
           opam-pin: false
 
       - name: Get OPAM executable path
-        # if: steps.cache-opam-env.outputs.cache-hit != 'true'
+        if: steps.cache-opam-env.outputs.cache-hit != 'true'
         uses: actions/github-script@v7
         with:
           script: |
@@ -174,63 +174,63 @@ jobs:
             console.log('stored path to .opam-path');
 
       - name: Install OPAM dependencies
-        # if: steps.cache-opam-env.outputs.cache-hit != 'true'
+        if: steps.cache-opam-env.outputs.cache-hit != 'true'
         run: opam install . --deps-only --with-test
 
-      # - name: Cache OPAM environment
-      #   # if: steps.cache-opam-env.outputs.cache-hit != 'true'
-      #   uses: actions/cache/save@v4
-      #   with:
-      #     path: |
-      #       ${{ runner.tool_cache }}/opam
-      #       ~/.opam
-      #       _opam
-      #       .opam-path
-      #       D:\cygwin
-      #       D:\.opam
-      #     key: ${{ env.opam_cache_key }}
-
-      # - name: Use cached OPAM environment
-      #   if: steps.cache-opam-env.outputs.cache-hit == 'true'
-      #   run: |
-      #     # https://github.com/ocaml/setup-ocaml/blob/b2105f9/packages/setup-ocaml/src/installer.ts#L33
-      #     echo "OPAMVERBOSE=$RUNNER_DEBUG"   >> "$GITHUB_ENV"
-      #     echo "OPAMCOLOR=always"            >> "$GITHUB_ENV"
-      #     echo "OPAMCONFIRMLEVEL=unsafe-yes" >> "$GITHUB_ENV"
-      #     echo "OPAMERRLOGLEN=0"             >> "$GITHUB_ENV"
-      #     echo "OPAMPRECISETRACKING=1"       >> "$GITHUB_ENV"
-      #     echo "OPAMYES=1"                   >> "$GITHUB_ENV"
-
-      #     if [[ "$RUNNER_OS" != "Windows" ]]; then
-      #       echo "OPAMROOT=$HOME/.opam"      >> "$GITHUB_ENV"
-      #     else
-      #       echo "OPAMROOT=D:\\.opam"        >> "$GITHUB_ENV"
-      #     fi
-
-      #     OPAM_PATH="$(cat .opam-path)"
-      #     chmod +x "$OPAM_PATH"
-      #     dirname "$OPAM_PATH" >> "$GITHUB_PATH"
-
-      #     if [[ "$RUNNER_OS" == "Windows" ]]; then
-      #       fsutil behavior query SymlinkEvaluation
-      #       fsutil behavior set symlinkEvaluation R2L:1 R2R:1
-      #       fsutil behavior query SymlinkEvaluation
-
-      #       CYGWIN="winsymlinks:native"
-      #       CYGWIN_ROOT="D:\\cygwin"
-      #       CYGWIN_ROOT_BIN="D:\\cygwin\\bin"
-      #       CYGWIN_ROOT_WRAPPERBIN="D:\\cygwin\\wrapperbin"
-
-      #       echo "HOME=$USERPROFILE" >> "$GITHUB_ENV"
-      #       echo "MSYS=winsymlinks:native" >> "$GITHUB_ENV"
-      #       echo "CYGWIN=$CYGWIN" >> "$GITHUB_ENV"
-      #       echo "CYGWIN_ROOT=$CYGWIN_ROOT" >> "$GITHUB_ENV"
-      #       echo "CYGWIN_ROOT_BIN=$CYGWIN_ROOT_BIN" >> "$GITHUB_ENV"
-      #       echo "CYGWIN_ROOT_WRAPPERBIN=$CYGWIN_ROOT_WRAPPERBIN" >> "$GITHUB_ENV"
-
-      #       echo "$CYGWIN_ROOT_WRAPPERBIN" >> "$GITHUB_PATH"
-      #     fi
-      #   shell: bash
+      - name: Cache OPAM environment
+        if: steps.cache-opam-env.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            ${{ runner.tool_cache }}/opam
+            ~/.opam
+            _opam
+            .opam-path
+            D:\cygwin
+            D:\.opam
+          key: ${{ env.opam_cache_key }}
+
+      - name: Use cached OPAM environment
+        if: steps.cache-opam-env.outputs.cache-hit == 'true'
+        run: |
+          # https://github.com/ocaml/setup-ocaml/blob/b2105f9/packages/setup-ocaml/src/installer.ts#L33
+          echo "OPAMVERBOSE=$RUNNER_DEBUG"   >> "$GITHUB_ENV"
+          echo "OPAMCOLOR=always"            >> "$GITHUB_ENV"
+          echo "OPAMCONFIRMLEVEL=unsafe-yes" >> "$GITHUB_ENV"
+          echo "OPAMERRLOGLEN=0"             >> "$GITHUB_ENV"
+          echo "OPAMPRECISETRACKING=1"       >> "$GITHUB_ENV"
+          echo "OPAMYES=1"                   >> "$GITHUB_ENV"
+
+          if [[ "$RUNNER_OS" != "Windows" ]]; then
+            echo "OPAMROOT=$HOME/.opam"      >> "$GITHUB_ENV"
+          else
+            echo "OPAMROOT=D:\\.opam"        >> "$GITHUB_ENV"
+          fi
+
+          OPAM_PATH="$(cat .opam-path)"
+          chmod +x "$OPAM_PATH"
+          dirname "$OPAM_PATH" >> "$GITHUB_PATH"
+
+          if [[ "$RUNNER_OS" == "Windows" ]]; then
+            fsutil behavior query SymlinkEvaluation
+            fsutil behavior set symlinkEvaluation R2L:1 R2R:1
+            fsutil behavior query SymlinkEvaluation
+
+            CYGWIN="winsymlinks:native"
+            CYGWIN_ROOT="D:\\cygwin"
+            CYGWIN_ROOT_BIN="D:\\cygwin\\bin"
+            CYGWIN_ROOT_WRAPPERBIN="D:\\cygwin\\wrapperbin"
+
+            echo "HOME=$USERPROFILE" >> "$GITHUB_ENV"
+            echo "MSYS=winsymlinks:native" >> "$GITHUB_ENV"
+            echo "CYGWIN=$CYGWIN" >> "$GITHUB_ENV"
+            echo "CYGWIN_ROOT=$CYGWIN_ROOT" >> "$GITHUB_ENV"
+            echo "CYGWIN_ROOT_BIN=$CYGWIN_ROOT_BIN" >> "$GITHUB_ENV"
+            echo "CYGWIN_ROOT_WRAPPERBIN=$CYGWIN_ROOT_WRAPPERBIN" >> "$GITHUB_ENV"
+
+            echo "$CYGWIN_ROOT_WRAPPERBIN" >> "$GITHUB_PATH"
+          fi
+        shell: bash
 
       - name: Compiler build state key
         id: compiler-build-state-key

CHANGELOG.md

@@ -17,17 +17,24 @@
 - Add `RegExp.flags`. https://github.com/rescript-lang/rescript/pull/7461
 - Add `Array.findLast`, `Array.findLastWithIndex`, `Array.findLastIndex`, `Array.findLastIndexWithIndex` and `Array.findLastIndexOpt`. https://github.com/rescript-lang/rescript/pull/7503
 - Add `options` argument to `Console.dir`. https://github.com/rescript-lang/rescript/pull/7504
+- Show variant constructor's inline record types on hover. https://github.com/rescript-lang/rescript/pull/7519
 
 #### :bug: Bug fix
 
 - `rescript-tools doc` no longer includes shadowed bindings in its output. https://github.com/rescript-lang/rescript/pull/7497
+- Treat `throw` like `raise` in analysis. https://github.com/rescript-lang/rescript/pull/7521
+- Fix `index out of bounds` exception thrown in rare cases by `rescript-editor-analysis.exe codeAction` command. https://github.com/rescript-lang/rescript/pull/7523
 
 #### :nail_care: Polish
 
 - Suggest awaiting promise before using it when types mismatch. https://github.com/rescript-lang/rescript/pull/7498
 - Complete from `RegExp` stdlib module for regexes. https://github.com/rescript-lang/rescript/pull/7425
 - Allow oneliner formatting when including module with single type alias. https://github.com/rescript-lang/rescript/pull/7502
 - Improve error messages for JSX type mismatches, passing objects where record is expected, passing array literal where tuple is expected, and more. https://github.com/rescript-lang/rescript/pull/7500
+- Show in error messages when coercion can be used to fix a type mismatch. https://github.com/rescript-lang/rescript/pull/7505
+- Remove deprecated pipe last (`|>`) syntax. https://github.com/rescript-lang/rescript/pull/7512
+- Improve error message for pipe (`->`) syntax. https://github.com/rescript-lang/rescript/pull/7520
+- Improve a few error messages around various subtyping issues. https://github.com/rescript-lang/rescript/pull/7404
 - Editor: add completions from included modules. https://github.com/rescript-lang/rescript/pull/7515
 
 # 12.0.0-alpha.13

analysis/examples/larger-project/src/arg_helper.res

@@ -76,27 +76,27 @@ module Make = (
       | exception Not_found =>
         switch S.Value.of_string(value) {
         | value => set_user_default(value, acc)
-        | exception exn => raise(Parse_failure(exn))
+        | exception exn => throw(Parse_failure(exn))
         }
       | equals =>
         let key_value_pair = value
         let length = String.length(key_value_pair)
         assert (equals >= 0 && equals < length)
         if equals == 0 {
-          raise(Parse_failure(Failure("Missing key in argument specification")))
+          throw(Parse_failure(Failure("Missing key in argument specification")))
         }
         let key = {
           let key = String.sub(key_value_pair, 0, equals)
           try S.Key.of_string(key) catch {
-          | exn => raise(Parse_failure(exn))
+          | exn => throw(Parse_failure(exn))
           }
         }
 
         let value = {
           let value = String.sub(key_value_pair, equals + 1, length - equals - 1)
 
           try S.Value.of_string(value) catch {
-          | exn => raise(Parse_failure(exn))
+          | exn => throw(Parse_failure(exn))
           }
         }
 

analysis/examples/larger-project/src/ast_helper.res

@@ -47,7 +47,7 @@ let with_default_loc = (l, f) => {
   } catch {
   | exn =>
     default_loc := old
-    raise(exn)
+    throw(exn)
   }
 }
 
@@ -94,7 +94,7 @@ module Typ = {
     @raises(Error)
     let check_variable = (vl, loc, v) =>
       if List.mem(v, vl) {
-        raise({
+        throw({
           open Syntaxerr
           Error(Variable_in_scope(loc, v))
         })

analysis/examples/larger-project/src/exception/BsJson.res

@@ -1,5 +1,5 @@
-@raise(DecodeError)
+@throw(DecodeError)
 let testBsJson = x => Json_decode.string(x)
 
-@raise(DecodeError)
+@throw(DecodeError)
 let testBsJson2 = x => Json.Decode.string(x)

analysis/examples/larger-project/src/exception/ExnB.res

@@ -1,2 +1,2 @@
 @raises(Not_found)
-let foo = () => raise(Not_found)
+let foo = () => throw(Not_found)

analysis/examples/larger-project/src/exception/Yojson.res

@@ -4,13 +4,13 @@ module Basic = {
   type t
 
   @raises(Json_error)
-  let from_string: string => t = _ => raise(Json_error("Basic.from_string"))
+  let from_string: string => t = _ => throw(Json_error("Basic.from_string"))
 
   module Util = {
     exception Type_error(string, t)
 
     @raises(Type_error)
-    let member: (string, t) => t = (_s, j) => raise(Type_error("Basic.Util.member", j))
+    let member: (string, t) => t = (_s, j) => throw(Type_error("Basic.Util.member", j))
 
     let to_int: t => int = _ => 34
 

analysis/examples/larger-project/src/location.res

@@ -257,5 +257,5 @@ let () = register_error_of_exn(x =>
 @raises(Error)
 let raise_errorf = (~loc=none, ~sub=list{}, ~if_highlight="") =>
   pp_ksprintf(~before=print_phanton_error_prefix, msg =>
-    raise(Error({loc: loc, msg: msg, sub: sub, if_highlight: if_highlight}))
+    throw(Error({loc: loc, msg: msg, sub: sub, if_highlight: if_highlight}))
   )