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

Fix for g; and g, commands.

Browse Source
This commit is contained in:
westim 2017-09-21 21:22:06 -04:00
parent 1ef93e90ab
commit 0ca190dbdf
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/actions/commands/actions.ts
View File

@ -2080,13 +2080,14 @@ class CommandGoBackInChangelist extends BaseCommand {
public async exec(position: Position, vimState: VimState): Promise<VimState> {
const originalIndex = vimState.historyTracker.changelistIndex;
const prevPos = vimState.historyTracker.getChangePositionAtindex(originalIndex);
const prevPos = vimState.historyTracker.getChangePositionAtindex(originalIndex - 1);
const currPos = vimState.historyTracker.getChangePositionAtindex(originalIndex);
if (prevPos !== undefined) {
vimState.cursorPosition = prevPos[0];
if (vimState.historyTracker.getChangePositionAtindex(originalIndex - 1) !== undefined) {
vimState.historyTracker.changelistIndex = originalIndex - 1;
}
vimState.historyTracker.changelistIndex = originalIndex - 1;
} else if (currPos !== undefined) {
vimState.cursorPosition = currPos[0];
}
return vimState;
@ -2099,20 +2100,15 @@ class CommandGoForwardInChangelist extends BaseCommand {
keys = ['g', ','];
public async exec(position: Position, vimState: VimState): Promise<VimState> {
let originalIndex = vimState.historyTracker.changelistIndex;
// Preincrement if on boundary to prevent seeing the same index twice
if (originalIndex === 1) {
originalIndex += 1;
}
const nextPos = vimState.historyTracker.getChangePositionAtindex(originalIndex);
const originalIndex = vimState.historyTracker.changelistIndex;
const nextPos = vimState.historyTracker.getChangePositionAtindex(originalIndex + 1);
const currPos = vimState.historyTracker.getChangePositionAtindex(originalIndex);
if (nextPos !== undefined) {
vimState.cursorPosition = nextPos[0];
if (vimState.historyTracker.getChangePositionAtindex(originalIndex + 1) !== undefined) {
vimState.historyTracker.changelistIndex = originalIndex + 1;
}
vimState.historyTracker.changelistIndex = originalIndex + 1;
} else if (currPos !== undefined) {
vimState.cursorPosition = currPos[0];
}
return vimState;