Merge branch 'master' into show-variant-inline-record-hover

Author: mediremi

.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

@@ -28,6 +28,8 @@
 - 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
 
 # 12.0.0-alpha.13
 

analysis/reanalyze/src/Exception.ml

@@ -304,17 +304,6 @@ let traverseAst () =
       let exceptions = [arg] |> raiseArgs in
       currentEvents := {Event.exceptions; loc; kind = Raises} :: !currentEvents;
       arg |> snd |> iterExprOpt self
-    | Texp_apply
-        {
-          funct = {exp_desc = Texp_ident (atat, _, _)};
-          args = [arg; (_lbl1, Some {exp_desc = Texp_ident (callee, _, _)})];
-        }
-      when (*  Exn(...) |> raise *)
-           atat |> Path.name = "Pervasives.|>" && callee |> Path.name |> isRaise
-      ->
-      let exceptions = [arg] |> raiseArgs in
-      currentEvents := {Event.exceptions; loc; kind = Raises} :: !currentEvents;
-      arg |> snd |> iterExprOpt self
     | Texp_apply {funct = {exp_desc = Texp_ident (callee, _, _)} as e; args} ->
       let calleeName = Path.name callee in
       if calleeName |> isRaise then

compiler/ml/error_message_utils.ml

@@ -11,6 +11,8 @@ let with_configured_jsx_module s =
 module Parser : sig
   type comment
 
+  val extract_text_at_loc : Location.t -> string
+
   val parse_source : (string -> Parsetree.structure * comment list) ref
 
   val reprint_source : (Parsetree.structure -> comment list -> string) ref
@@ -38,10 +40,13 @@ end = struct
     let end_offset = end_pos.pos_cnum in
     String.sub src start_offset (end_offset - start_offset)
 
-  let parse_expr_at_loc loc =
+  let extract_text_at_loc loc =
     (* TODO: Maybe cache later on *)
     let src = Ext_io.load_file loc.Location.loc_start.pos_fname in
-    let sub_src = extract_location_string ~src loc in
+    extract_location_string ~src loc
+
+  let parse_expr_at_loc loc =
+    let sub_src = extract_text_at_loc loc in
     let parsed, comments = !parse_source sub_src in
     match parsed with
     | [{Parsetree.pstr_desc = Pstr_eval (exp, _)}] -> Some (exp, comments)
@@ -59,6 +64,11 @@ end = struct
     | None -> None
 end
 
+let type_expr ppf typ =
+  (* print a type and avoid infinite loops *)
+  Printtyp.reset_and_mark_loops typ;
+  Printtyp.type_expr ppf typ
+
 type type_clash_statement = FunctionCall
 type type_clash_context =
   | SetRecordField
@@ -345,6 +355,43 @@ let print_extra_type_clash_help ~extract_concrete_typedecl ~env loc ppf
          single JSX element.@,"
         (with_configured_jsx_module "array")
     | _ -> ())
+  | _, Some (t1, t2) ->
+    let is_subtype =
+      try
+        Ctype.subtype env t1 t2 ();
+        true
+      with _ -> false
+    in
+    let target_type_string = Format.asprintf "%a" type_expr t2 in
+    let target_expr_text = Parser.extract_text_at_loc loc in
+    let suggested_rewrite =
+      match
+        !Parser.parse_source
+          (Printf.sprintf "(%s :> %s)" target_expr_text target_type_string)
+      with
+      | [], _ -> None
+      | structure, comments -> Some (!Parser.reprint_source structure comments)
+    in
+
+    (* Suggesting coercion only makes sense for non-constant values. *)
+    let is_constant =
+      match !Parser.parse_source target_expr_text with
+      | ( [{Parsetree.pstr_desc = Pstr_eval ({pexp_desc = Pexp_constant _}, _)}],
+          _ ) ->
+        true
+      | _ -> false
+    in
+
+    if is_subtype && not is_constant then (
+      fprintf ppf
+        "@,\
+         @,\
+         Possible solutions: @,\
+         - These types are compatible at runtime. You can use the coercion \
+         operator to convert to the expected type";
+      match suggested_rewrite with
+      | Some rewrite -> fprintf ppf ": @{<info>%s@}@," rewrite
+      | None -> fprintf ppf ": @{<info>:>@}@,")
   | _ -> ()
 
 let type_clash_context_from_function sexp sfunct =

compiler/ml/typecore.ml

@@ -4168,10 +4168,8 @@ let longident = Printtyp.longident
 let super_report_unification_error = Printtyp.super_report_unification_error
 let report_ambiguous_type_error = Printtyp.report_ambiguous_type_error
 let report_subtyping_error = Printtyp.report_subtyping_error
-let type_expr ppf typ =
-  (* print a type and avoid infinite loops *)
-  Printtyp.reset_and_mark_loops typ;
-  Printtyp.type_expr ppf typ
+
+let type_expr = Error_message_utils.type_expr
 
 let report_error env loc ppf error =
   match error with

compiler/syntax/src/res_comments_table.ml

@@ -1483,9 +1483,8 @@ and walk_expression expr t comments =
                   txt =
                     Longident.Lident
                       ( ":=" | "||" | "&&" | "==" | "===" | "<" | ">" | "!="
-                      | "!==" | "<=" | ">=" | "|>" | "+" | "+." | "-" | "-."
-                      | "++" | "^" | "*" | "*." | "/" | "/." | "**" | "->"
-                      | "<>" );
+                      | "!==" | "<=" | ">=" | "+" | "+." | "-" | "-." | "++"
+                      | "^" | "*" | "*." | "/" | "/." | "**" | "->" | "<>" );
                 };
           };
         args = [(Nolabel, operand1); (Nolabel, operand2)];

compiler/syntax/src/res_core.ml

@@ -2186,25 +2186,9 @@ and parse_binary_expr ?(context = OrdinaryExpr) ?a p prec =
       let b = parse_binary_expr ~context p token_prec in
       let loc = mk_loc a.Parsetree.pexp_loc.loc_start b.pexp_loc.loc_end in
       let expr =
-        match (token, b.pexp_desc) with
-        | ( BarGreater,
-            Pexp_apply {funct = fun_expr; args; partial; transformed_jsx} ) ->
-          {
-            b with
-            pexp_desc =
-              Pexp_apply
-                {
-                  funct = fun_expr;
-                  args = args @ [(Nolabel, a)];
-                  partial;
-                  transformed_jsx;
-                };
-          }
-        | BarGreater, _ -> Ast_helper.Exp.apply ~loc b [(Nolabel, a)]
-        | _ ->
-          Ast_helper.Exp.apply ~loc
-            (make_infix_operator p token start_pos end_pos)
-            [(Nolabel, a); (Nolabel, b)]
+        Ast_helper.Exp.apply ~loc
+          (make_infix_operator p token start_pos end_pos)
+          [(Nolabel, a); (Nolabel, b)]
       in
       Parser.eat_breadcrumb p;
       loop expr)

compiler/syntax/src/res_parsetree_viewer.ml

@@ -280,7 +280,7 @@ let operator_precedence operator =
   | "&&" -> 3
   | "^" -> 4
   | "&" -> 5
-  | "==" | "===" | "<" | ">" | "!=" | "<>" | "!==" | "<=" | ">=" | "|>" -> 6
+  | "==" | "===" | "<" | ">" | "!=" | "<>" | "!==" | "<=" | ">=" -> 6
   | "<<" | ">>" | ">>>" -> 7
   | "+" | "+." | "-" | "-." | "++" -> 8
   | "*" | "*." | "/" | "/." | "%" -> 9
@@ -317,8 +317,8 @@ let is_unary_bitnot_expression expr =
 let is_binary_operator operator =
   match operator with
   | ":=" | "||" | "&&" | "==" | "===" | "<" | ">" | "!=" | "!==" | "<=" | ">="
-  | "|>" | "+" | "+." | "-" | "-." | "++" | "*" | "*." | "/" | "/." | "**"
-  | "->" | "<>" | "%" | "&" | "^" | "<<" | ">>" | ">>>" ->
+  | "+" | "+." | "-" | "-." | "++" | "*" | "*." | "/" | "/." | "**" | "->"
+  | "<>" | "%" | "&" | "^" | "<<" | ">>" | ">>>" ->
     true
   | _ -> false
 
@@ -715,7 +715,7 @@ let is_single_pipe_expr expr =
     match expr.pexp_desc with
     | Pexp_apply
         {
-          funct = {pexp_desc = Pexp_ident {txt = Longident.Lident ("->" | "|>")}};
+          funct = {pexp_desc = Pexp_ident {txt = Longident.Lident "->"}};
           args = [(Nolabel, _operand1); (Nolabel, _operand2)];
         } ->
       true
@@ -724,7 +724,7 @@ let is_single_pipe_expr expr =
   match expr.pexp_desc with
   | Pexp_apply
       {
-        funct = {pexp_desc = Pexp_ident {txt = Longident.Lident ("->" | "|>")}};
+        funct = {pexp_desc = Pexp_ident {txt = Longident.Lident "->"}};
         args = [(Nolabel, operand1); (Nolabel, _operand2)];
       }
     when not (is_pipe_expr operand1) ->