Skip to content

Fix gv after leaving visual-line or visual-block mode with Esc #281

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jiaxuan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix gv after leaving visual-line or visual-block mode with Esc #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 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 @@ -2686,6 +2686,18 @@ testVim('reselect_visual_line', function(cm, vim, helpers) {
helpers.doKeys('V', 'p' , 'g', 'v', 'd');
eq('foo\nand', cm.getValue());
}, { value: 'hello\nthis\nis\nfoo\nand\nbar' });
testVim('reselect_visual_line_after_esc', function(cm, vim, helpers) {
helpers.doKeys('l', 'V', 'j', '<Esc>', 'g', 'v');
eq(vim.visualLine, true);
helpers.doKeys('d');
eq('is\nfoo', cm.getValue());
}, { value: 'hello\nthis\nis\nfoo' });
testVim('reselect_visual_block_after_esc', function(cm, vim, helpers) {
cm.setCursor(0, 1);
helpers.doKeys('<C-v>', 'j', 'l', '<Esc>', 'g', 'v');
eq(vim.visualBlock, true);
eq(cm.getSelections().join(''), '23oo');
}, { value: '123456\nfoo\nbar' });
testVim('reselect_visual_block', function(cm, vim, helpers) {
cm.setCursor(1, 2);
helpers.doKeys('<C-v>', 'k', 'h', '<C-v>');
Expand Down
6 changes: 6 additions & 0 deletions packages/codemirror-vim-core/vim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3958,6 +3958,12 @@ export function initVim(CM) {
if (moveHead !== false) {
cm.setCursor(clipCursorToContent(cm, vim.sel.head));
}
// Outside a vim operation (a typed <Esc> exits from handleEsc in findKey),
// the cursor move above reports cursor activity, and
// handleExternalSelection exits visual mode itself, recording the last
// selection with its linewise/blockwise flags. Recording it again here,
// after those flags were cleared, would make `gv` reselect charwise.
if (!vim.visualMode) return;
updateLastSelection(cm, vim);
vim.visualMode = false;
vim.visualLine = false;
Expand Down