Skip to content
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

Jump to bottom

Fix back search when no matching (#4047) #4157

Merged
merged 2 commits into from
Oct 20, 2019
Merged

Fix back search when no matching (#4047) #4157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52baeba
Fix find back search when no match (#4047)
seachicken Oct 10, 2019
a7e1983
Merge branch 'master' into issue4047
J-Fields Oct 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 12 additions & 32 deletions src/actions/motion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,9 @@ class MoveFindForward extends BaseMovement {
const toFind = Notation.ToControlCharacter(this.keysPressed[1]);
let result = position.findForwards(toFind, count);

vimState.lastSemicolonRepeatableMovement = new MoveFindForward(this.keysPressed, true);
vimState.lastCommaRepeatableMovement = new MoveFindBackward(this.keysPressed, true);

if (!result) {
return { start: position, stop: position, failed: true };
}
Expand All @@ -573,14 +576,6 @@ class MoveFindForward extends BaseMovement {
result = result.getRight();
}

if (
!this.isRepeat &&
(!vimState.recordedState.operator || !(isIMovement(result) && result.failed))
) {
vimState.lastSemicolonRepeatableMovement = new MoveFindForward(this.keysPressed, true);
vimState.lastCommaRepeatableMovement = new MoveFindBackward(this.keysPressed, true);
}

return result;
}
}
Expand All @@ -606,18 +601,13 @@ class MoveFindBackward extends BaseMovement {
const toFind = Notation.ToControlCharacter(this.keysPressed[1]);
let result = position.findBackwards(toFind, count);

vimState.lastSemicolonRepeatableMovement = new MoveFindBackward(this.keysPressed, true);
vimState.lastCommaRepeatableMovement = new MoveFindForward(this.keysPressed, true);

if (!result) {
return { start: position, stop: position, failed: true };
}

if (
!this.isRepeat &&
(!vimState.recordedState.operator || !(isIMovement(result) && result.failed))
) {
vimState.lastSemicolonRepeatableMovement = new MoveFindBackward(this.keysPressed, true);
vimState.lastCommaRepeatableMovement = new MoveFindForward(this.keysPressed, true);
}

return result;
}
}
Expand All @@ -640,6 +630,9 @@ class MoveTilForward extends BaseMovement {
result = position.tilForwards(toFind, 2);
}

vimState.lastSemicolonRepeatableMovement = new MoveTilForward(this.keysPressed, true);
vimState.lastCommaRepeatableMovement = new MoveTilBackward(this.keysPressed, true);

if (!result) {
return { start: position, stop: position, failed: true };
}
Expand All @@ -648,14 +641,6 @@ class MoveTilForward extends BaseMovement {
result = result.getRight();
}

if (
!this.isRepeat &&
(!vimState.recordedState.operator || !(isIMovement(result) && result.failed))
) {
vimState.lastSemicolonRepeatableMovement = new MoveTilForward(this.keysPressed, true);
vimState.lastCommaRepeatableMovement = new MoveTilBackward(this.keysPressed, true);
}

return result;
}
}
Expand All @@ -678,18 +663,13 @@ class MoveTilBackward extends BaseMovement {
result = position.tilBackwards(toFind, 2);
}

vimState.lastSemicolonRepeatableMovement = new MoveTilBackward(this.keysPressed, true);
vimState.lastCommaRepeatableMovement = new MoveTilForward(this.keysPressed, true);

if (!result) {
return { start: position, stop: position, failed: true };
}

if (
!this.isRepeat &&
(!vimState.recordedState.operator || !(isIMovement(result) && result.failed))
) {
vimState.lastSemicolonRepeatableMovement = new MoveTilBackward(this.keysPressed, true);
vimState.lastCommaRepeatableMovement = new MoveTilForward(this.keysPressed, true);
}

return result;
}
}
Expand Down
28 changes: 28 additions & 0 deletions test/mode/normalModeTests/motions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,13 @@ suite('Motions in Normal Mode', () => {
end: ['text|\tttext'],
});

newTest({
title: "Can handle 'f' and find back search",
start: ['text tex|t'],
keysPressed: 'fe,',
end: ['text t|ext'],
});

newTest({
title: "Can handle 'F'",
start: ['text tex|t'],
Expand All @@ -242,6 +249,13 @@ suite('Motions in Normal Mode', () => {
end: ['tex|t text'],
});

newTest({
title: "Can handle 'F' and find back search",
start: ['|text text'],
keysPressed: 'Fx,',
end: ['te|xt text'],
});

newTest({
title: "Can handle 't'",
start: ['text tex|t'],
Expand All @@ -256,6 +270,13 @@ suite('Motions in Normal Mode', () => {
end: ['te|xt text'],
});

newTest({
title: "Can handle 't' and find back search",
start: ['text tex|t'],
keysPressed: 'te,',
end: ['text te|xt'],
});

newTest({
title: "Can handle 'T'",
start: ['text tex|t'],
Expand All @@ -270,6 +291,13 @@ suite('Motions in Normal Mode', () => {
end: ['text t|ext'],
});

newTest({
title: "Can handle 'T' and find back search",
start: ['|text text'],
keysPressed: 'Tx,',
end: ['t|ext text'],
});

newTest({
title: 'Can run a forward search',
start: ['|one two three'],
Expand Down