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

fixed a dumb bug

Browse Source
This commit is contained in:
Horace He 2017-05-20 19:06:00 -04:00
parent 90456624e4
commit efbcac2188
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/actions/motion.ts
View File

@ -252,18 +252,20 @@ class MoveDownFoldFix extends MoveByScreenLineMaintainDesiredColumn {
}
let t: Position;
let count = 0;
const prevDesiredColumn = vimState.desiredColumn;
do {
t = <Position>(await new MoveDownByScreenLineMaintainDesiredColumn().execAction(position, vimState));
count = 1;
t = <Position>(await new MoveDownByScreenLine().execAction(position, vimState));
count += 1;
} while (t.line === position.line);
if (t.line > position.line) {
if (t.line > position.line + 1) {
return t;
}
while (count > 0) {
await new MoveUpByScreenLine().execAction(position, vimState);
t = <Position>await new MoveUpByScreenLine().execAction(position, vimState);
count--;
}
return await super.execAction(position, vimState);
vimState.desiredColumn = prevDesiredColumn;
return await position.getDown(vimState.desiredColumn);
}
}
@ -327,20 +329,23 @@ class MoveUpFoldFix extends MoveByScreenLineMaintainDesiredColumn {
return position;
}
let t: Position;
const prevDesiredColumn = vimState.desiredColumn;
let count = 0;
do {
t = <Position>(await new MoveUpByScreenLineMaintainDesiredColumn().execAction(position, vimState));
count = 1;
count += 1;
} while (t.line === position.line);
if (t.line < position.line) {
vimState.desiredColumn = prevDesiredColumn;
if (t.line < position.line - 1) {
return t;
}
while (count > 0) {
await new MoveDownByScreenLine().execAction(position, vimState);
t = <Position>await new MoveDownByScreenLine().execAction(position, vimState);
count--;
}
return await super.execAction(position, vimState);
vimState.desiredColumn = prevDesiredColumn;
return await position.getUp(vimState.desiredColumn);
}
}