waveterm/xterm.js
0
0
Fork 0
mirror of https://github.com/wavetermdev/xterm.js.git synced 2026-08-05 13:43:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Get multiple matches working after incremental changes

Browse Source
This commit is contained in:
Daniel Imms
2018-12-26 15:32:34 -08:00
parent 204e42a151
commit 76302e2146
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/addons/search/SearchHelper.ts
+4 -2
View File
@@ -52,11 +52,12 @@ export class SearchHelper implements ISearchHelper {
startCol = incremental ? selectionManager.selectionStart[0] : selectionManager.selectionEnd[0];
}
}
console.log(`Start from ${startCol},${startRow}`);
this._initLinesCache();
// Search from startRow to end
for (let y = incremental ? startRow : startRow + 1; y < this._terminal._core.buffer.ybase + this._terminal.rows; y++) {
for (let y = startRow; y < this._terminal._core.buffer.ybase + this._terminal.rows; y++) {
result = this._findInLine(term, { row: y, col: startCol }, searchOptions);
if (result) {
break;
@@ -111,7 +112,7 @@ export class SearchHelper implements ISearchHelper {
this._initLinesCache();
// Search from startRow to top
for (let y = incremental ? startRow : startRow - 1; y >= 0; y--) {
for (let y = startRow; y >= 0; y--) {
result = this._findInLine(term, {row: y, col: startCol}, searchOptions, isReverseSearch);
if (result) {
break;
@@ -216,6 +217,7 @@ export class SearchHelper implements ISearchHelper {
resultIndex = searchStringLine.lastIndexOf(searchTerm, searchIndex.col - searchTerm.length);
} else {
resultIndex = searchStringLine.indexOf(searchTerm, searchIndex.col);
console.log('resultIndex', resultIndex);
}
}