Skip to content

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

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

Merged
Tyriar merged 8 commits into from
May 3, 2020
Merged

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

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
50ba6bf
Wrap search back if there exists a result in search
RishabhKothaari Apr 25, 2020
45ff3ee
Update SearchAddon.ts
RishabhKothaari Apr 25, 2020
08f8f51
handle wrap back with find previous
RishabhKothaari Apr 26, 2020
a5c1e59
Merge pull request #1 from rishab-pdx/#2840
RishabhKothaari Apr 26, 2020
5bb710e
Merge branch 'master' of https://github.com/xtermjs/xterm.js
RishabhKothaari Apr 26, 2020
0e145a1
Merge branch 'master' into #2840
RishabhKothaari Apr 26, 2020
853b454
Merge branch 'master' of https://github.com/xtermjs/xterm.js into #2840
RishabhKothaari Apr 30, 2020
5eb33e9
Merge branch 'master' of https://github.com/xtermjs/xterm.js into #2840
RishabhKothaari Apr 30, 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
10 changes: 7 additions & 3 deletions addons/xterm-addon-search/src/SearchAddon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,12 @@ export class SearchAddon implements ITerminalAddon {
}
}

// If there is only one result, return true.
if (!result && currentSelection) return true;
// If there is only one result, wrap back and return selection if it exists.
if (!result && currentSelection) {
searchPosition.startRow = currentSelection.startRow;
searchPosition.startCol = 0;
result = this._findInLine(term, searchPosition, searchOptions);
}

// Set selection and scroll if a result was found
return this._selectResult(result);
Expand Down Expand Up @@ -175,7 +179,7 @@ export class SearchAddon implements ITerminalAddon {
}
// If we hit the top and didn't search from the very bottom wrap back down
if (!result && startRow !== (this._terminal.buffer.active.baseY + this._terminal.rows)) {
for (let y = (this._terminal.buffer.active.baseY + this._terminal.rows); y > startRow; y--) {
for (let y = (this._terminal.buffer.active.baseY + this._terminal.rows); y >= startRow; y--) {
searchPosition.startRow = y;
result = this._findInLine(term, searchPosition, searchOptions, isReverseSearch);
if (result) {
Expand Down