Skip to content

use correct start col/row in next search #3707

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
meganrogge merged 4 commits into from
Mar 23, 2022
Merged

use correct start col/row in next search #3707

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9d10f1
use correct start col/row
meganrogge Mar 23, 2022
5af5fe3
Merge branch 'master' into findImprovements
meganrogge Mar 23, 2022
3a0f645
throw for invalid row or col
meganrogge Mar 23, 2022
93f7ad8
Merge branch 'findImprovements' of https://github.com/meganrogge/xter…
meganrogge Mar 23, 2022
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
15 changes: 11 additions & 4 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 @@ -139,7 +139,12 @@ export class SearchAddon implements ITerminalAddon {
let result = this._find(term, 0, 0, searchOptions);
while (result && !this._searchResults.get(`${result.row}-${result.col}`)) {
this._searchResults.set(`${result.row}-${result.col}`, result);
result = this._find(term, result.row, result.col + 1, searchOptions);
result = this._find(
term,
result.col + result.term.length >= this._terminal.cols ? result.row + 1 : result.row,
result.col + result.term.length >= this._terminal.cols ? 0 : result.col + 1,
searchOptions
);
}
this._searchResults.forEach(result => {
const resultDecoration = this._createResultDecoration(result, searchOptions.decorations!);
Expand All @@ -157,15 +162,17 @@ export class SearchAddon implements ITerminalAddon {
}
}

private _find(term: string, startRow?: number, startCol?: number, searchOptions?: ISearchOptions): ISearchResult | undefined {
private _find(term: string, startRow: number, startCol: number, searchOptions?: ISearchOptions): ISearchResult | undefined {
if (!this._terminal || !term || term.length === 0) {
this._terminal?.clearSelection();
this.clearDecorations();
return undefined;
}
if (startRow > this._terminal.rows || startCol > this._terminal.cols) {
throw new Error(`Invalid row: ${startRow} or col: ${startCol} to search in terminal with ${this._terminal.rows} rows and ${this._terminal.cols} cols`);
}

let result: ISearchResult | undefined = undefined;
startCol = startCol || 0;
startRow = startRow ?? 0;

this._initLinesCache();

Expand Down