Skip to content

Fix issue with ast conversion on functions with attributes on arguments. #7761

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 3 commits into from
Aug 12, 2025
Merged

Fix issue with ast conversion on functions with attributes on arguments. #7761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e1cd78
Fix issue with ast conversion on functions with attributes on arguments.
cristianoc Aug 11, 2025
4c3c880
Adapt conversion from old parsetree
cristianoc Aug 11, 2025
856879b
Update CHANGELOG.md
cristianoc Aug 11, 2025
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 @@
#### :rocket: New Feature

#### :bug: Bug fix
- Fix issue with ast conversion (for ppx use) on functions with attributes on first argument. https://github.com/rescript-lang/rescript/pull/7761

#### :memo: Documentation

Expand Down
4 changes: 3 additions & 1 deletion compiler/ml/ast_mapper_to0.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,9 @@ module T = struct
| Ptyp_arrow {arg; ret; arity} -> (
let lbl = Asttypes.to_noloc arg.lbl in
let typ0 =
arrow ~loc ~attrs lbl (sub.typ sub arg.typ) (sub.typ sub ret)
arrow ~loc
~attrs:(attrs @ sub.attributes sub arg.attrs)
lbl (sub.typ sub arg.typ) (sub.typ sub ret)
in
match arity with
| None -> typ0
Expand Down
1 change: 1 addition & 0 deletions tests/syntax_tests/data/ast-mapping/FunWithAttribute.res
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
type fn = (@as("something") ~foo: string) => int
1 change: 1 addition & 0 deletions tests/syntax_tests/data/ast-mapping/expected/FunWithAttribute.res.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
type fn = (@as("something") ~foo: string) => int
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit illustrates the difference.
This should fix the original issue, but needs testing just in case.

Loading