From a6e7dbc840d43af7573b89852ce27b3d8eb86f75 Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Wed, 14 Sep 2022 09:50:48 +0200 Subject: [PATCH] Sync latest master. Fixes https://github.com/rescript-lang/rescript-compiler/issues/5635 --- CHANGELOG.md | 1 + lib/4.06.1/unstable/js_compiler.ml | 2 +- lib/4.06.1/unstable/js_playground_compiler.ml | 2 +- lib/4.06.1/whole_compiler.ml | 2 +- syntax | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3713fe074e..71598033bf 100644 --- 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 index a2ab156dcf..7a8f9e4028 100644 --- 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 index 9c626066b3..1f994c5148 100644 --- 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 index 3275aab1b8..70f6f45d6c 100644 --- 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 index 155eded352..60a9dc7a8f 160000 --- a/syntax +++ b/syntax @@ -1 +1 @@ -Subproject commit 155eded352ee1eea643900e4ecf091895c757043 +Subproject commit 60a9dc7a8fbfd8bc2892959c6f5a1725ed75ea36