VSCodeVim/Vim
1
1
Fork 0
mirror of https://github.com/VSCodeVim/Vim.git synced 2024-09-11 20:27:17 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3472 from rickythefox/master

Browse Source 
Set < and > marks when yanking in visual mode.
This commit is contained in:
Jason Poon 2019-02-17 12:07:03 -08:00 committed by GitHub
commit fa0285dc8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/actions/operator.ts
View File

@ -261,25 +261,30 @@ export class YankOperator extends BaseOperator {
if (end.isEarlierThan(start)) {
[start, end] = [end, start];
}
end = new Position(end.line, end.character + 1);
let extendedEnd = new Position(end.line, end.character + 1);
if (vimState.currentRegisterMode === RegisterMode.LineWise) {
start = start.getLineBegin();
end = end.getLineEnd();
extendedEnd = extendedEnd.getLineEnd();
}
let text = TextEditor.getText(new vscode.Range(start, end));
let text = TextEditor.getText(new vscode.Range(start, extendedEnd));
// If we selected the newline character, add it as well.
if (
vimState.currentMode === ModeName.Visual &&
end.character === TextEditor.getLineAt(end).text.length + 1
extendedEnd.character === TextEditor.getLineAt(extendedEnd).text.length + 1
) {
text = text + '\n';
}
Register.put(text, vimState, this.multicursorIndex);
if (vimState.currentMode === ModeName.Visual || vimState.currentMode === ModeName.VisualLine) {
vimState.historyTracker.addMark(start, '<');
vimState.historyTracker.addMark(end, '>');
}
await vimState.setCurrentMode(ModeName.Normal);
vimState.cursorStartPosition = start;
@ -660,6 +665,9 @@ export class YankVisualBlockMode extends BaseOperator {
Register.put(toCopy, vimState, this.multicursorIndex);
vimState.historyTracker.addMark(start, '<');
vimState.historyTracker.addMark(end, '>');
const numLinesYanked = toCopy.split('\n').length;
ReportLinesYanked(numLinesYanked, vimState);