Skip to content

Fix da}/da) text objects picking the wrong block when the cursor is before a block #278

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

Open
deepanshupal wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix da}/da) text objects picking the wrong block when the cursor is before a block #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aaf7e45
Fix da}/da) text objects picking the wrong block before a block
deepanshupal Oct 3, 2026
7c4c389
Test da}/da) before a block (#264)
deepanshupal Oct 3, 2026
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
8 changes: 8 additions & 0 deletions packages/codemirror-vim-core/test/vim_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1623,6 +1623,14 @@ testEdit('da{_middle_spc', 'a{\n\tbar\n}b', /r/, 'da{', 'ab');
testEdit('da}_middle_spc', 'a{\n\tbar\n}b', /r/, 'da}', 'ab');
testEdit('daB_middle_spc', 'a{\n\tbar\n}b', /r/, 'daB', 'ab');

// Cursor before any block: the closing-bracket forms must behave like the
// opening-bracket forms and pick the first block opened ahead of the cursor,
// not the first closing bracket in the document (replit/codemirror-vim#264).
var outsideBlockDoc = 'f(a) {\n while (x) {\n y;\n }\n z;\n}';
testEdit('da{_before_block_selects_first_opened_block', outsideBlockDoc, /f/, 'da{', 'f(a) ');
testEdit('da}_before_block_selects_first_opened_block', outsideBlockDoc, /f/, 'da}', 'f(a) ');
testEdit('da)_before_block_selects_first_opened_pair', 'x f(a(b)) y', /x/, 'da)', 'x f y');

// open and close on diff lines, open indented less than close
testEdit('di{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'di{', 'a{}b');
testEdit('di}_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'di}', 'a{}b');
Expand Down
4 changes: 3 additions & 1 deletion packages/codemirror-vim-core/vim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2614,7 +2614,9 @@ export function initVim(CM) {
move = true;
tmp = selectCompanionObject(cm, head, character, inclusive);
if (!tmp) {
var sc = cm.getSearchCursor(new RegExp("\\" + character, "g"), head)
// Look ahead for the opening bracket, whichever form was typed.
var openChar = ')}]>'.indexOf(character) >= 0 ? mirroredPairs[character] : character;
var sc = cm.getSearchCursor(new RegExp("\\" + openChar, "g"), head)
if (sc.find()) {
// @ts-ignore
tmp = selectCompanionObject(cm, sc.from(), character, inclusive);
Expand Down