eiac/xterm.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Revert "Fix search not expanding selection to left when appropriate"

Browse Source 
This reverts commit a9d2b8a55c.
This commit is contained in:
Ken Aoki
2020-10-13 06:44:01 +00:00
parent a9d2b8a55c
commit b6074df4bf
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/xterm-addon-search/src/SearchAddon.ts
+13 -7
View File
@@ -141,14 +141,14 @@ export class SearchAddon implements ITerminalAddon {
const isReverseSearch = true; const isReverseSearch = true;
let startRow = this._terminal.buffer.active.baseY + this._terminal.rows; let startRow = this._terminal.buffer.active.baseY + this._terminal.rows;
let startCol = this._terminal.cols; let startCol = this._terminal.cols;
let result: ISearchResult | undefined;
const incremental = searchOptions ? searchOptions.incremental : false;
let currentSelection: ISelectionPosition | undefined; let currentSelection: ISelectionPosition | undefined;
if (this._terminal.hasSelection()) { if (this._terminal.hasSelection()) {
const incremental = searchOptions ? searchOptions.incremental : false;
// Start from selection start if there is a selection
// For incremental search, use selection end
currentSelection = this._terminal.getSelectionPosition()!; currentSelection = this._terminal.getSelectionPosition()!;
startRow = incremental ? currentSelection.endRow : currentSelection.startRow; // Start from selection start if there is a selection
startCol = incremental ? currentSelection.endColumn : currentSelection.startColumn; startRow = currentSelection.startRow;
startCol = currentSelection.startColumn;
} }
this._initLinesCache(); this._initLinesCache();
@@ -157,8 +157,14 @@ export class SearchAddon implements ITerminalAddon {
startCol startCol
}; };
// Search startRow if (incremental) {
let result = this._findInLine(term, searchPosition, searchOptions, isReverseSearch); result = this._findInLine(term, searchPosition, searchOptions, false);
if (!(result && result.row === startRow && result.col === startCol)) {
result = this._findInLine(term, searchPosition, searchOptions, true);
}
} else {
result = this._findInLine(term, searchPosition, searchOptions, isReverseSearch);
}
// Search from startRow - 1 to top // Search from startRow - 1 to top
if (!result) { if (!result) {