Skip to content

check if undefined instead of index directly to fix search addon issue #3767

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 5 commits into from
May 9, 2022
Merged

check if undefined instead of index directly to fix search addon issue #3767

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0fd5c27
fix #3766
meganrogge May 9, 2022
87bfce6
Merge branch 'master' into merogge/search-fix-zero
meganrogge May 9, 2022
ae97a4d
check that it's not undefined
meganrogge May 9, 2022
3587aa2
Merge branch 'merogge/search-fix-zero' of https://github.com/meganrog…
meganrogge May 9, 2022
d9705c4
Merge branch 'master' into merogge/search-fix-zero
meganrogge May 9, 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
4 changes: 2 additions & 2 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 @@ -128,7 +128,7 @@ export class SearchAddon implements ITerminalAddon {
}
this._lastSearchOptions = searchOptions;
if (searchOptions?.decorations) {
if (this._resultIndex || this._cachedSearchTerm && term !== this._cachedSearchTerm) {
if (!!this._resultIndex || this._cachedSearchTerm && term !== this._cachedSearchTerm) {
this._highlightAllMatches(term, searchOptions);
}
}
Expand Down Expand Up @@ -306,7 +306,7 @@ export class SearchAddon implements ITerminalAddon {
throw new Error('Cannot use addon until it has been loaded');
}
this._lastSearchOptions = searchOptions;
if (searchOptions?.decorations && (this._resultIndex || term !== this._cachedSearchTerm)) {
if (searchOptions?.decorations && (!!this._resultIndex || term !== this._cachedSearchTerm)) {
this._highlightAllMatches(term, searchOptions);
}
return this._fireResults(term, this._findPreviousAndSelect(term, searchOptions), searchOptions);
Expand Down