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

Different behavior when search two same words in only one row #2867

Merged
merged 8 commits into from
May 3, 2020
Merged

Different behavior when search two same words in only one row #2867

merged 8 commits into from
May 3, 2020

Conversation

RishabhKothaari
Copy link
Contributor

@RishabhKothaari RishabhKothaari commented Apr 25, 2020 •
edited by Tyriar
Loading

Fixes #2840. We must wrap back search to 0th column if we have a currentSelection. @Tyriar let me know if any further changes are required.

@RishabhKothaari
Wrap search back if there exists a result in search
50ba6bf 
Search must wrap back as it does when there are multiple lines.
@RishabhKothaari
Update SearchAddon.ts
45ff3ee
@RishabhKothaari RishabhKothaari mentioned this pull request Apr 25, 2020
Closed
@RishabhKothaari RishabhKothaari changed the title #2840 #2840 Different behavior when search two same words in only one row Apr 25, 2020
@RishabhKothaari RishabhKothaari changed the title #2840 Different behavior when search two same words in only one row Different behavior when search two same words in only one row Apr 25, 2020
Tyriar
Tyriar requested changes Apr 25, 2020
View reviewed changes
Copy link
Member

@Tyriar Tyriar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to work well, it should also work for find previous as well

@RishabhKothaari
Copy link
Contributor Author

@Tyriar do you mean if we hit the beginning(column 0) with find previous we must wrap again to the end of the column or last search selection?

RishabhKothaari and others added 3 commits April 25, 2020 17:33
@RishabhKothaari
handle wrap back with find previous
08f8f51 
wrap back search selection to last selected result when we hit top
@RishabhKothaari
Merge pull request #1 from rishab-pdx/xtermjs#2840
a5c1e59 
handle wrap back with find previous
@RishabhKothaari
Merge branch 'master' of https://github.com/xtermjs/xterm.js
5bb710e
@RishabhKothaari RishabhKothaari requested a review from Tyriar April 26, 2020 00:49
@RishabhKothaari
Copy link
Contributor Author

Let me know if any other changes are required.

@Tyriar Tyriar added this to the 4.6.0 milestone Apr 27, 2020
Tyriar
Tyriar approved these changes May 3, 2020
View reviewed changes
Copy link
Member

@Tyriar Tyriar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works great thanks 🙂

@Tyriar Tyriar merged commit 6f1f4ba into xtermjs:master May 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Tyriar Tyriar Tyriar approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
4.6.0
Development

Successfully merging this pull request may close these issues.

Different behavior when search two same words in only one row
2 participants
@RishabhKothaari @Tyriar