Skip to content

Sync latest syntax master, with fix for location in JSX V4. #5662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 14, 2022
Merged

Sync latest syntax master, with fix for location in JSX V4. #5662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/4.06.1/unstable/js_compiler.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/4.06.1/unstable/js_playground_compiler.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/4.06.1/whole_compiler.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion syntax
Open in desktop
Submodule syntax updated 9 files
+2 −1 CHANGELOG.md
+1 −1 cli/reactjs_jsx_ppx.ml
+1 −0 tests/ppx/react/expected/commentAtTop.res.txt
+2 −0 tests/ppx/react/expected/fileLevelConfig.res.txt
+4 −0 tests/ppx/react/expected/forwardRef.res.txt
+2 −0 tests/ppx/react/expected/newtype.res.txt
+2 −0 tests/ppx/react/expected/topLevel.res.txt
+2 −0 tests/ppx/react/expected/typeConstraint.res.txt
+1 −0 tests/ppx/react/expected/v4.res.txt