match pairs which don't form a standalone TS node #7242
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
pascalkuthe
added
C-enhancement
pascalkuthe
force-pushed
the
better_pairs
branch
2 times, most recently
from
ff90c6f to
f5a3f99
Compare
|
also addresses #3357 (comment) (which is an unrelated bug but a small fix that makes sense to include here) I also did wind up including a (very limited) plaintext fallback to handle text-only nodes (c preprocessor nodes for example #3357 (comment)) but to not break existing workflows this only works when absolutely no other TS match it found (and only on the brackets, and within the first named parent TS node ). I am still not sure if that's really worth having since it will case brackets inside literals to be highlighted and that feels weird to me. |
dead10ck
reviewed
Jun 6, 2023
dead10ck
previously approved these changes
Jun 6, 2023
alevinval
reviewed
Jun 6, 2023
alevinval
reviewed
Jun 6, 2023
alevinval
reviewed
Jun 6, 2023
alevinval
previously approved these changes
Jun 6, 2023
This was referenced Jul 15, 2023
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.
Closes #3357
Closes #5177
These issues where caused by us requiring pairs to form a standalone TS node. This change looks at the sibling nodes (so still within the same node) to also find pairs formed by siblings. Syntax trees are usually much wider than deep, so I introduced a fairy aggressive limit on the number of examined nodes. Usually pairs form immediate siblings and looking at additional siblings is just done to handle weird grammars (and comments). The limit does lead to missing some matches but those cases are so rare that it's worth the improved performance IMO.