Sync latest master.

cristianoc · cristianoc · commit 417cb0779acf · 2022-09-14T10:08:28.000+02:00
Fixes #5635
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@
 
 #### :bug: Bug Fix
 
+- Fix location issue in error messages with JSX V4 where the body of the component is an application https://github.com/rescript-lang/syntax/pull/633
 - Fix printing of type declarations in error message where they would be considered recursive by default
 - Fix issue where the printer would omit attributes for `->` and `|>` https://github.com/rescript-lang/syntax/pull/629
 - Fix printing of optional fields in records https://github.com/rescript-lang/rescript-compiler/issues/5654
diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml
@@ -273917,7 +273917,7 @@ module V4 = struct
                       (Pat.var ~loc:emptyLoc {loc = emptyLoc; txt})
                       fullExpression;
                   ]
-                  (Exp.ident ~loc:emptyLoc {loc = emptyLoc; txt = Lident txt})
+                  (Exp.ident ~loc:pstr_loc {loc = emptyLoc; txt = Lident txt})
             in
             let stripConstraint pattern =
               match pattern with
diff --git a/lib/4.06.1/unstable/js_playground_compiler.ml b/lib/4.06.1/unstable/js_playground_compiler.ml
@@ -275380,7 +275380,7 @@ module V4 = struct
                       (Pat.var ~loc:emptyLoc {loc = emptyLoc; txt})
                       fullExpression;
                   ]
-                  (Exp.ident ~loc:emptyLoc {loc = emptyLoc; txt = Lident txt})
+                  (Exp.ident ~loc:pstr_loc {loc = emptyLoc; txt = Lident txt})
             in
             let stripConstraint pattern =
               match pattern with
diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml
@@ -285759,7 +285759,7 @@ module V4 = struct
                       (Pat.var ~loc:emptyLoc {loc = emptyLoc; txt})
                       fullExpression;
                   ]
-                  (Exp.ident ~loc:emptyLoc {loc = emptyLoc; txt = Lident txt})
+                  (Exp.ident ~loc:pstr_loc {loc = emptyLoc; txt = Lident txt})
             in
             let stripConstraint pattern =
               match pattern with
diff --git a/syntax b/syntax
@@ -1 +1 @@
-Subproject commit 155eded352ee1eea643900e4ecf091895c757043
+Subproject commit 60a9dc7a8fbfd8bc2892959c6f5a1725ed75ea36

Original file line number	Diff line number	Diff line change
`@@ -273917,7 +273917,7 @@ module V4 = struct`
`273917`	`273917`	`(Pat.var ~loc:emptyLoc {loc = emptyLoc; txt})`
`273918`	`273918`	`fullExpression;`
`273919`	`273919`	`]`
`273920`		`- (Exp.ident ~loc:emptyLoc {loc = emptyLoc; txt = Lident txt})`
	`273920`	`+ (Exp.ident ~loc:pstr_loc {loc = emptyLoc; txt = Lident txt})`
`273921`	`273921`	`in`
`273922`	`273922`	`let stripConstraint pattern =`
`273923`	`273923`	`match pattern with`
Original file line number	Diff line number	Diff line change
`@@ -275380,7 +275380,7 @@ module V4 = struct`
`275380`	`275380`	`(Pat.var ~loc:emptyLoc {loc = emptyLoc; txt})`
`275381`	`275381`	`fullExpression;`
`275382`	`275382`	`]`
`275383`		`- (Exp.ident ~loc:emptyLoc {loc = emptyLoc; txt = Lident txt})`
	`275383`	`+ (Exp.ident ~loc:pstr_loc {loc = emptyLoc; txt = Lident txt})`
`275384`	`275384`	`in`
`275385`	`275385`	`let stripConstraint pattern =`
`275386`	`275386`	`match pattern with`
Original file line number	Diff line number	Diff line change
`@@ -285759,7 +285759,7 @@ module V4 = struct`
`285759`	`285759`	`(Pat.var ~loc:emptyLoc {loc = emptyLoc; txt})`
`285760`	`285760`	`fullExpression;`
`285761`	`285761`	`]`
`285762`		`- (Exp.ident ~loc:emptyLoc {loc = emptyLoc; txt = Lident txt})`
	`285762`	`+ (Exp.ident ~loc:pstr_loc {loc = emptyLoc; txt = Lident txt})`
`285763`	`285763`	`in`
`285764`	`285764`	`let stripConstraint pattern =`
`285765`	`285765`	`match pattern with`