vim: Fix % motion edge case #39620
Merged
vim: Fix % motion edge case #39620
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
This commit improves the `%` motion handling of nested brackets for languages where `</>` are also valid brackets. With the previous implementation, when `%` was used, Zed would try to find the innermost bracket pair starting from the cursor position which, when the cursor is positioned at the closing bracket, ends up returning the nested bracket pair. When this was the case, Zed would iterate over all available bracket pairs and, if one of them started with `<` it would check if there's a corresponding closing tag, and jump to that closing tag instead. These changes simply check if any of the bracket ranges being processed exactly match the cursor's offset in the buffer and, if so, it means we're dealing with the actual bracket pair and should stop processing and looking at other bracket pairs.
- Introduce new `new_tsx` test setup function - Add new test case to test the issue with nested curly brackets and HTML tags when using the `%` motion
cla-bot
bot
added
the
cla-signed
LivioGama
pushed a commit
to LivioGama/zed
that referenced
this pull request
Oct 11, 2025
Update Vim's `%` motion to first attempt finding the exact matching bracket/tag under the cursor, then fall back to the previous nearest-enclosing logic if none is found. This prevents accidentally jumping to nested pairs in languages like TSX and Svelte where `<>`, `</>`, and `/>` are also treated as brackets. Closes zed-industries#39368 Release Notes: - Fixed an edge case with the `%` motion in vim, where the cursor could end up in a closing HTML tag instead of the matching bracket
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.
Update Vim's
%motion to first attempt finding the exact matching bracket/tag under the cursor, then fall back to the previous nearest-enclosing logic if none is found. This prevents accidentally jumping to nested pairs in languages like TSX and Svelte where<>,</>, and/>are also treated as brackets.Closes #39368
Release Notes:
%motion in vim, where the cursor could end up in a closing HTML tag instead of the matching bracket