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

Fixed backward search from end of word (VSCodeVim #4266) #4294

Merged
merged 5 commits into from
Nov 24, 2019
Merged

Fixed backward search from end of word (VSCodeVim #4266) #4294

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3160618
Fixed backward search from end of word
bdomanski Nov 22, 2019
8db3a59
Merge branch 'master' into fix-backwards-search-from-word-end
bdomanski Nov 22, 2019
85436db
Regression test for fixed searching functionality
bdomanski Nov 24, 2019
1fe2a85
Merge branch 'master' into fix-backwards-search-from-word-end
bdomanski Nov 24, 2019
e37856b
Merge branch 'master' into fix-backwards-search-from-word-end
J-Fields Nov 24, 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
2 changes: 1 addition & 1 deletion src/state/searchState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ export class SearchState {
.slice(0)
.reverse()
.entries()) {
if (matchRange.start.compareTo(startPosition) < 0) {
if (matchRange.end.compareTo(startPosition) <= 0) {
return {
start: Position.FromVSCodePosition(matchRange.start),
end: Position.FromVSCodePosition(matchRange.end),
Expand Down
7 changes: 7 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 @@ -312,6 +312,13 @@ suite('Motions in Normal Mode', () => {
end: ['one two |two two'],
});

newTest({
title: 'Can run a forward and find previous search from end of word',
start: ['|one two one two'],
keysPressed: '/two/e\nN',
end: ['one two one tw|o'],
});

// These "remembering history between editor" tests have started
// breaking. Since I don't remember these tests ever breaking for real, and
// because they're the cause of a lot of flaky tests, I'm disabling these for
Expand Down