Merge branch 'master' into alexr00/caseSearch

This commit is contained in:
Daniel Imms
2018-09-11 22:29:01 -07:00
committed by GitHub
2 changed files with 8 additions and 5 deletions
+3 -3
View File
@@ -173,10 +173,10 @@ export class SearchHelper implements ISearchHelper {
let lineWrapsToNext: boolean;
do {
lineString += this._terminal._core.buffer.translateBufferLineToString(lineIndex, true);
const nextLine = this._terminal._core.buffer.lines.get(lineIndex + 1);
lineWrapsToNext = nextLine ? nextLine.isWrapped : false;
lineString += this._terminal._core.buffer.translateBufferLineToString(lineIndex, !lineWrapsToNext && trimRight);
lineIndex++;
const nextLine = this._terminal._core.buffer.lines.get(lineIndex);
lineWrapsToNext = nextLine ? this._terminal._core.buffer.lines.get(lineIndex).isWrapped : false;
} while (lineWrapsToNext);
return lineString;