Skip to content

fix :'a,.y ex command #257

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
nightwing wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix :'a,.y ex command #257

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
121 changes: 95 additions & 26 deletions src/vim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ export function initVim(CM) {
{ name: 'startinsert', shortName: 'start' },
{ name: 'nohlsearch', shortName: 'noh' },
{ name: 'yank', shortName: 'y' },
{ name: 'put', shortName: 'pu' },
{ name: 'delmarks', shortName: 'delm' },
{ name: 'marks', excludeFromCommandHistory: true },
{ name: 'registers', shortName: 'reg', excludeFromCommandHistory: true },
Expand Down Expand Up @@ -1983,6 +1984,12 @@ export function initVim(CM) {
if (vim.visualMode) {
promptOptions.value = '\'<,\'>';
promptOptions.selectValueOnOpen = false;
} else {
var repeat = vim.inputState.getRepeat();
if (repeat > 1) {
promptOptions.value = '.,.+' + (repeat - 1);
promptOptions.selectValueOnOpen = false;
}
}
showPrompt(cm, promptOptions);
}
Expand Down Expand Up @@ -2901,6 +2908,9 @@ export function initVim(CM) {
vimGlobalState.registerController.pushText(
args.registerName, 'yank',
text, args.linewise, vim.visualBlock);

var lineCount = Math.abs(cm.getCursor("end").line - cm.getCursor("start").line) || 1;
showConfirm(cm, lineCount + ' lines yanked' + (args.registerName ? ' into "' + args.registerName : ''), false, 1500);
return endPos;
},
rot13: function(cm, args, ranges, oldAnchor, newHead) {
Expand Down Expand Up @@ -3291,7 +3301,7 @@ export function initVim(CM) {
if (actionArgs.repeat > 1) {
text = Array(actionArgs.repeat + 1).join(text);
}
var linewise = register.linewise;
var linewise = actionArgs.linewise == undefined ? register.linewise : actionArgs.linewise;
var blockwise = register.blockwise;
var textLines = blockwise ? text.split('\n') : undefined;
if (textLines) {
Expand Down Expand Up @@ -5288,8 +5298,8 @@ export function initVim(CM) {
return n;
}

/** @arg {CodeMirror} cm @arg {any} template @arg {boolean} [long]*/
function showConfirm(cm, template, long) {
/** @arg {CodeMirror} cm @arg {any} template @arg {boolean} [long] @arg {number} [duration]*/
function showConfirm(cm, template, long, duration) {
var pre = dom('div', {$color: 'red', $whiteSpace: 'pre', class: 'cm-vim-message'}, template);
if (cm.openNotification) {
if (long) {
Expand All @@ -5299,9 +5309,9 @@ export function initVim(CM) {
}
cm.state.closeVimNotification = cm.openNotification(pre, {bottom: true, duration: 0});
} else {
cm.openNotification(pre, {bottom: true, duration: 15000});
cm.openNotification(pre, {bottom: true, duration: duration || 15000});
}
} else {
} else if (!duration) {
alert(pre.innerText);
}
}
Expand Down Expand Up @@ -5628,7 +5638,7 @@ export function initVim(CM) {
this.parseInput_(cm, inputStream, params);
} catch(e) {
showConfirm(cm, e + "");
throw e;
return;
}

if (vim.visualMode) {
Expand Down Expand Up @@ -5689,6 +5699,12 @@ export function initVim(CM) {
if (inputStream.eat('%')) {
result.line = cm.firstLine();
result.lineEnd = cm.lastLine();
} else if (inputStream.eat('*')) {
var lastSelection = cm.state.vim.lastSelection;
var anchor = lastSelection?.anchorMark.find()?.line || 0;
var head = lastSelection?.headMark.find()?.line || 0;
result.line = Math.max(anchor, head);
result.lineEnd = Math.min(anchor, head);
} else {
result.line = this.parseLineSpec_(cm, inputStream);
if (result.line !== undefined && inputStream.eat(',')) {
Expand All @@ -5708,6 +5724,7 @@ export function initVim(CM) {
result.selectionLineEnd = result.lineEnd;
}

inputStream.eatSpace();
// Parse command name.
var commandMatch = inputStream.match(/^(\w+|!!|@@|[!#&*<=>@~])/);
if (commandMatch) {
Expand All @@ -5723,43 +5740,68 @@ export function initVim(CM) {
* @param {import("@codemirror/language").StringStream} inputStream
*/
parseLineSpec_(cm, inputStream) {
var numberMatch = inputStream.match(/^(\d+)/);
var numberMatch = inputStream.match(/^([\d]+)/);
if (numberMatch) {
// Absolute line number plus offset (N+M or N-M) is probably a typo,
// not something the user actually wanted. (NB: vim does allow this.)
return parseInt(numberMatch[1], 10) - 1;
return this.parseLineSpecOffset_(cm, inputStream, parseInt(numberMatch[1], 10) - 1);
}
switch (inputStream.next()) {
case '.':
return this.parseLineSpecOffset_(inputStream, cm.getCursor().line);
return this.parseLineSpecOffset_(cm, inputStream, cm.getCursor().line);
case '$':
return this.parseLineSpecOffset_(inputStream, cm.lastLine());
return this.parseLineSpecOffset_(cm, inputStream, cm.lastLine());
case '\'':
var markName = inputStream.next() || "";
var markPos = getMarkPos(cm, cm.state.vim, markName);
if (!markPos) throw new Error('Mark not set');
return this.parseLineSpecOffset_(inputStream, markPos.line);
return this.parseLineSpecOffset_(cm, inputStream, markPos.line);
case '-':
case '+':
case '/':
case '?':
inputStream.backUp(1);
// Offset is relative to current line if not otherwise specified.
return this.parseLineSpecOffset_(inputStream, cm.getCursor().line);
return this.parseLineSpecOffset_(cm, inputStream, cm.getCursor().line);
default:
inputStream.backUp(1);
return undefined;
}
}
/**
* @param {CodeMirrorV} cm
* @param {string | import("@codemirror/language").StringStream} inputStream
* @param {number} line
*/
parseLineSpecOffset_(inputStream, line) {
var offsetMatch = inputStream.match(/^([+-])?(\d+)/);
if (offsetMatch) {
var offset = parseInt(offsetMatch[2], 10);
if (offsetMatch[1] == "-") {
line -= offset;
parseLineSpecOffset_(cm, inputStream, line) {
while (true) {
var offsetMatch = inputStream.match(/^([\/\?]|\\[\?\/])|([+-]?)(\d*)/)
if (!offsetMatch || !offsetMatch[0])
break;

if (offsetMatch[1]) {
var queryString = "";
var forward = !offsetMatch[1].endsWith("?");
if (offsetMatch[1].length == 1) {
var queryMatch = inputStream.match(forward ? /^([^\/\\]|\\\/)*/ : /^([^\/\?]|\\\?)*/);
inputStream.match(forward ? /^\/?/ : /^\??/);
queryString = queryMatch && queryMatch[0];
}
if (!queryString) {
queryString = vimGlobalState.registerController.getRegister('/')?.toString() || "";
}
var query = new RegExp(queryString);
var cursor = cm.getSearchCursor(query, new Pos(line + (forward ? 1 : 0), 0));
if (forward) {
cursor.findNext();
} else {
cursor.findPrevious();
}
var nextPos = cursor.from();
if (!nextPos) {
throw new Error("Pattern not found" + query);
}
line = nextPos.line;
} else {
var offset = parseInt(offsetMatch[2] + (offsetMatch[3] || '1'), 10);
line += offset;
}
}
Expand Down Expand Up @@ -6365,13 +6407,40 @@ export function initVim(CM) {
nohlsearch: function(cm) {
clearSearchHighlight(cm);
},
/** @arg {CodeMirrorV} cm */
yank: function (cm) {
var cur = copyCursor(cm.getCursor());
var line = cur.line;
var lineText = cm.getLine(line);
/** @arg {CodeMirrorV} cm @arg {ExParams} params */
yank: function (cm, params) {
var line = params.selectionLine;
var lineEnd = isNaN(params.selectionLineEnd) ? line : params.selectionLineEnd;
if (lineEnd < line) {
var tmp = lineEnd;
lineEnd = line;
line = tmp;
}
var text = cm.getRange(new Pos(line, 0), new Pos(lineEnd + 1, 0));
var registerName = params.args && params.args[0] ? params.args[0] : '0';
vimGlobalState.registerController.pushText(
'0', 'yank', lineText, true, true);
registerName, 'yank', text, true, false);
showConfirm(cm, (lineEnd + 1 - line) + ' lines yanked' + (registerName ? ' into "' + registerName : ''), false, 1500);
},
/** @arg {CodeMirrorV} cm @arg {ExParams} params @arg {boolean} [matchIndent]*/
put: function(cm, params, matchIndent) {
var actionArgs = { after: true, isEdit: true, matchIndent: !!matchIndent, repeat: 1, lineWise: true, registerName: '' };
var args = params.args || [];
if (args[0] == "!") {
actionArgs.after = false;
args.shift();
}
if (args[0]) {
actionArgs.registerName = args[0];
}
var line = params.selectionLine;
if (line != undefined)
cm.setCursor(new Pos(line, 0));
actions.paste(cm, actionArgs, cm.state.vim);
},
/** @arg {CodeMirrorV} cm @arg {ExParams} params*/
iput: function(cm, params) {
this.put(cm, params, true);
},
/** @arg {CodeMirrorV} cm @arg {ExParams} params*/
delete: function(cm, params) {
Expand Down
20 changes: 19 additions & 1 deletion test/vim_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4216,6 +4216,8 @@ testVim('ex_go_to_line', function(cm, vim, helpers) {
cm.setCursor(0, 0);
helpers.doEx('4');
helpers.assertCursorAt(3, 0);
helpers.doEx('4-1');
helpers.assertCursorAt(2, 0);
}, { value: 'a\nb\nc\nd\ne\n'});
testVim('ex_go_to_mark', function(cm, vim, helpers) {
cm.setCursor(3, 0);
Expand Down Expand Up @@ -4246,6 +4248,22 @@ testVim('ex_go_to_mark_offset', function(cm, vim, helpers) {
helpers.doEx('\'a+2');
helpers.assertCursorAt(4, 0);
}, { value: 'a\nb\nc\nd\ne\n'});
testVim('ex_advanced_range_syntax', function(cm, vim, helpers) {
helpers.doEx('0/m');
helpers.assertCursorAt(3, 0);
helpers.doKeys('m', 'a');
helpers.doEx('/m//m/');
helpers.assertCursorAt(8, 0);
helpers.doEx("'a,.y x");
helpers.doEx('10?m??m?put! x');
eq("1\n2\n3\n4m\n5\n6\n4m\n5\n6\n7m\n8\n9m\n7m\n8\n9m\n10\n", cm.getValue());
helpers.doEx('1+++2+/m/,1/m//m/+2-/m/+2d');
eq("1\n2\n3\n4m\n5\n6\n7m\n8\n9m\n10\n", cm.getValue());
helpers.doKeys('3', ':');
eq(cm.getWrapperElement().querySelector("input").value, ".,.+2");
helpers.doKeys('d', '\n');
eq("1\n2\n3\n4m\n5\n6\n10\n", cm.getValue());
}, {value: "1\n2\n3\n4m\n5\n6\n7m\n8\n9m\n10\n"});
testVim('ex_write', function(cm, vim, helpers) {
var tmp = CodeMirror.commands.save;
var written;
Expand Down Expand Up @@ -5180,7 +5198,7 @@ testVim('ex_api_test', function(cm, vim, helpers) {
// Testing ex-commands with non-alpha names.
testVim('ex_special_names', function(cm, vim, helpers) {
var ran,val;
var cmds = ['!','!!','#','&','*','<','=','>','@','@@','~','regtest1','RT2'];
var cmds = ['!','!!','#','&','<','=','>','@','@@','~','regtest1','RT2'];
cmds.forEach(function(name){
CodeMirror.Vim.defineEx(name,'',function(cm,params){
ran=params.commandName;
Expand Down