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

Bugfix: search backwards with operator #5041

Merged
merged 9 commits into from
Jul 17, 2020
Merged

Bugfix: search backwards with operator #5041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
73b1af2
Merge pull request #1 from VSCodeVim/master
sql-koala Jul 1, 2020
0299943
Merge pull request #2 from VSCodeVim/master
sql-koala Jul 15, 2020
22a3d17
Tests for search after operator.
Jul 17, 2020
40409a6
Allow SearchBackwards with operator.
Jul 17, 2020
1ee7720
Fix test (gnarrff).
Jul 17, 2020
c9ec5cb
Fix test (really).
Jul 17, 2020
96c8365
Merge branch 'master' into BugfixSearchBackwardsWithOperator
J-Fields Jul 17, 2020
614439e
Fix test, sorry Travis.
Jul 17, 2020
3b04969
Merge branch 'BugfixSearchBackwardsWithOperator' of https://github.co…
Jul 17, 2020
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
7 changes: 0 additions & 7 deletions src/actions/commands/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,13 +1204,6 @@ export class CommandSearchBackwards extends BaseCommand {
isMotion = true;
isJump = true;

public doesActionApply(vimState: VimState, keysPressed: string[]): boolean {
// Prevent collision with `g?` (rot13 operator)
return (
super.doesActionApply(vimState, keysPressed) && vimState.recordedState.operator === undefined
);
}

public async exec(position: Position, vimState: VimState): Promise<VimState> {
globalState.searchState = new SearchState(
SearchDirection.Backward,
Expand Down
16 changes: 16 additions & 0 deletions test/mode/modeNormal.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2375,6 +2375,22 @@ suite('Mode Normal', () => {
endMode: Mode.Normal,
});

newTest({
title: 'Can delete with search forward',
start: ['foo |junk junk bar'],
keysPressed: 'd/bar\n',
end: ['foo |bar'],
endMode: Mode.Normal,
});

newTest({
title: 'Can delete with search backward',
start: ['foo junk garbage trash |bar'],
keysPressed: 'd?junk\n',
end: ['foo |bar'],
endMode: Mode.Normal,
});

newTest({
title: 'Can do C',
start: ['export const options = {', '|', '};'],
Expand Down