[JavaScript] Fix comma after ternary expression #3986
Merged
Conversation
This file contains 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
keith-hall
approved these changes
May 9, 2024
jfcherng
approved these changes
May 9, 2024
deathaxe
added a commit
to deathaxe/sublime-packages
that referenced
this pull request
Aug 5, 2024
This commit fixes a regression, introduced by sublimehq#3986, which breaks syntax highlighting in objects, as comma is no longer consumed as key-value-pair separator. It's not the ternary expression, which allows commas, but the for statement, which allows multiple expressions, separated by comma after `in` keyword. for (var in <expr>, <expr>, ...) expr: any valid expression, maybe ternary, maybe function-call The change to ternary expressions is reverted and for-condition context is modified instead to allow multiple expressions after `in` keyword. Also scope `;` invalid if there are too many.
deathaxe
added a commit
that referenced
this pull request
Aug 6, 2024
* [JavaScript] Fix ternary operator regression This commit fixes a regression, introduced by #3986, which breaks syntax highlighting in objects, as comma is no longer consumed as key-value-pair separator. It's not the ternary expression, which allows commas, but the for statement, which allows multiple expressions, separated by comma after `in` keyword. for (var in <expr>, <expr>, ...) expr: any valid expression, maybe ternary, maybe function-call The change to ternary expressions is reverted and for-condition context is modified instead to allow multiple expressions after `in` keyword. Also scope `;` invalid if there are too many. * [JavaScript] Tweak for-conditon context switching This commit... 1. adds a `pop: 1` to the pattern of `for-condition` to make sure at most one opening parenthesis after for is consumed as loop condition. The following may have happened before. for (...) (...) 2. Tweaks how `meta.group` is applied as it sometimes makes a difference, whether a scope is a `meta_scope` or not, especially related with `clear_scopes` keyword.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 #3985
This PR sets
expressioninstead ofexpression-no-commaonto stack after ternary expressions, so they can appear in the middle of sequences.