merge conflict

cristianoc · cristianoc · commit 65b1c681034e · 2024-12-18T12:27:38.000+01:00
diff --git a/compiler/syntax/src/jsx_v4.ml b/compiler/syntax/src/jsx_v4.ml
@@ -1267,10 +1267,7 @@ let map_binding ~config ~empty_loc ~pstr_loc ~file_name ~rec_flag binding =
                 [(Nolabel, Exp.ident {txt = Lident "props"; loc})]))
       in
 
-      let wrapper_expr =
-        Ast_uncurried.uncurried_fun ~loc:wrapper_expr.pexp_loc ~arity:1
-          wrapper_expr
-      in
+      let wrapper_expr = Ast_uncurried.uncurried_fun ~arity:1 wrapper_expr in
 
       let internal_expression =
         Exp.let_ Nonrecursive
diff --git a/tests/build_tests/super_errors/expected/react_component_with_props.res.expected b/tests/build_tests/super_errors/expected/react_component_with_props.res.expected
@@ -1,11 +1,11 @@
 
   [1;31mWe've found a bug for you![0m
-  [36m/.../fixtures/react_component_with_props.res[0m:[2m4:5-13:10[0m
+  [36m/.../fixtures/react_component_with_props.res[0m:[2m3:31-13:10[0m
 
+   1 [2m│[0m module V4C7 = {
    2 [2m│[0m   @react.componentWithProps
-   3 [2m│[0m   let make = React.forwardRef((
-   [1;31m4[0m [2m│[0m     [1;31m~className=?,[0m
-   [1;31m5[0m [2m│[0m [1;31m    ~children,[0m
+   [1;31m3[0m [2m│[0m   let make = React.forwardRef([1;31m([0m
+   [1;31m4[0m [2m│[0m [1;31m    ~className=?,[0m
    [2m.[0m [2m│[0m [2m...[0m
   [1;31m12[0m [2m│[0m [1;31m      children[0m
   [1;31m13[0m [2m│[0m [1;31m    </div>[0m

-Original file line number
+Diff line change
@@ @@ -1,11 +1,11 @@ @@
   [1;31mWe've found a bug for you![0m
 -  [36m/.../fixtures/react_component_with_props.res[0m:[2m4:5-13:10[0m
 +  [36m/.../fixtures/react_component_with_props.res[0m:[2m3:31-13:10[0m
 +   1 [2m│[0m module V4C7 = {
 [2m│[0m   @react.componentWithProps
 -   3 [2m│[0m   let make = React.forwardRef((
 -   [1;31m4[0m [2m│[0m     [1;31m~className=?,[0m
 -   [1;31m5[0m [2m│[0m [1;31m    ~children,[0m
 +   [1;31m3[0m [2m│[0m   let make = React.forwardRef([1;31m([0m
 +   [1;31m4[0m [2m│[0m [1;31m    ~className=?,[0m
    [2m.[0m [2m│[0m [2m...[0m
   [1;31m12[0m [2m│[0m [1;31m      children[0m
   [1;31m13[0m [2m│[0m [1;31m    </div>[0m