fix: place ending heregex tokens one index earlier #17
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes decaffeinate/decaffeinate#710 The lexer generates fake tokens for interpolated heregexes, and the ending tokens were being placed where the start (inclusive) and end (inclusive) index were one past the end of the heregex. This meant that in a case like `[a ///#{b}///]`, the end tokens of the heregex and also the implicit function call end were all being placed at the `]`, so the AST location data would say that the function call ends at the end of the `]`. This caused decaffeinate to insert the close-paren after the `]`, which is wrong. To fix, I can just subtract 1 from the position of those ending heregex tokens so that their end lines up with the end of the heregex itself. This is similar to previous fixes that changed `OUTDENT` and `CALL_END` tokens so that the end of the token lines up with the end of the AST node.
eventualbuddha
approved these changes
Jan 3, 2017
eventualbuddha
left a comment
eventualbuddha
left a comment
There was a problem hiding this comment.
Seems good. Should we submit upstream?
Member
Author
|
Yep, I can take care of that. |
alangpierce
added a commit
to alangpierce/coffeescript
that referenced
this pull request
Feb 17, 2017
This is an upstream port of decaffeinate#17 The lexer generates fake tokens for interpolated heregexes, and the ending tokens were being placed where the start (inclusive) and end (inclusive) index were one past the end of the heregex. This meant that in a case like `[a ///#{b}///]`, the end tokens of the heregex and also the implicit function call end were all being placed at the `]`, so the AST location data would say that the function call ends at the end of the `]`. To fix, I can just subtract 1 from the position of those ending heregex tokens so that their end lines up with the end of the heregex itself. This is similar to previous fixes that changed `OUTDENT` and `CALL_END` tokens so that the end of the token lines up with the end of the AST node.
EsrefDurna
pushed a commit
to EsrefDurna/coffeescript
that referenced
this pull request
Nov 12, 2025
This is an upstream port of decaffeinate#17 The lexer generates fake tokens for interpolated heregexes, and the ending tokens were being placed where the start (inclusive) and end (inclusive) index were one past the end of the heregex. This meant that in a case like `[a ///#{b}///]`, the end tokens of the heregex and also the implicit function call end were all being placed at the `]`, so the AST location data would say that the function call ends at the end of the `]`. To fix, I can just subtract 1 from the position of those ending heregex tokens so that their end lines up with the end of the heregex itself. This is similar to previous fixes that changed `OUTDENT` and `CALL_END` tokens so that the end of the token lines up with the end of the AST node.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes decaffeinate/decaffeinate#710
The lexer generates fake tokens for interpolated heregexes, and the ending
tokens were being placed where the start (inclusive) and end (inclusive) index
were one past the end of the heregex. This meant that in a case like
[a ///#{b}///], the end tokens of the heregex and also the implicit functioncall end were all being placed at the
], so the AST location data would saythat the function call ends at the end of the
]. This caused decaffeinate toinsert the close-paren after the
], which is wrong.To fix, I can just subtract 1 from the position of those ending heregex tokens
so that their end lines up with the end of the heregex itself. This is similar
to previous fixes that changed
OUTDENTandCALL_ENDtokens so that the endof the token lines up with the end of the AST node.