Skip to content

fixed jump kN past fold lands on expected position #9894

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

fixed jump kN past fold lands on expected position #9894

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: 11 additions & 1 deletion src/actions/motion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,17 @@ class MoveUpFoldFix extends MoveByScreenLineMaintainDesiredColumn {
t = await moveUpByScreenLine.execAction(position, vimState);
t = t instanceof Position ? t : t.stop;
const lineChanged = prev.line !== t.line;
const colChanged = prev.character !== t.character;
// Fixes issue https://github.com/VSCodeVim/Vim/issues/9885
// In the case where we are passing a folded line (that is longer than screen width)
// moving upwards (using a command like '10k') the first time we actually land on
// the folded line we return an adjusted position based on desired column.
// The next 'k' movement will then look like it did not move from prev position and
// in this case we need to treat this as a column change to keep moving up.
const colAdjustmentForDesiredColumnWasDoneLastMoveAndWeShouldTreatThisAsColumnChange =
prev?.isEqual(t);
const colChanged =
colAdjustmentForDesiredColumnWasDoneLastMoveAndWeShouldTreatThisAsColumnChange ||
prev.character !== t.character;
if (lineChanged || !colChanged) {
break;
}
Expand Down