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

Fix search not expanding selection to left when appropriate

Browse Source
This commit is contained in:
Ken Aoki
2020-10-10 04:04:52 +00:00
parent 782797ca11
commit a9d2b8a55c
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/xterm-addon-search/src/SearchAddon.ts
+7 -13
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()) {
currentSelection = this._terminal.getSelectionPosition()!; const incremental = searchOptions ? searchOptions.incremental : false;
// Start from selection start if there is a selection // Start from selection start if there is a selection
startRow = currentSelection.startRow; // For incremental search, use selection end
startCol = currentSelection.startColumn; currentSelection = this._terminal.getSelectionPosition()!;
startRow = incremental ? currentSelection.endRow : currentSelection.startRow;
startCol = incremental ? currentSelection.endColumn : currentSelection.startColumn;
} }
this._initLinesCache(); this._initLinesCache();
@@ -157,14 +157,8 @@ export class SearchAddon implements ITerminalAddon {
startCol startCol
}; };
if (incremental) { // Search startRow
result = this._findInLine(term, searchPosition, searchOptions, false); let result = this._findInLine(term, searchPosition, searchOptions, isReverseSearch);
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) {