Merge branch 'master' into vscode-issue-60401

2018-10-30 19:33:05 -04:00
parent 2efd28ad4b 160b4a7d66
commit 5173bd6419
10 changed files with 95 additions and 32 deletions
@@ -195,7 +195,7 @@ export class SearchHelper implements ISearchHelper {
    do {
      const nextLine = this._terminal._core.buffer.lines.get(lineIndex + 1);
      lineWrapsToNext = nextLine ? nextLine.isWrapped : false;
-      lineString += this._terminal._core.buffer.translateBufferLineToString(lineIndex, !lineWrapsToNext && trimRight);
+      lineString += this._terminal._core.buffer.translateBufferLineToString(lineIndex, !lineWrapsToNext && trimRight).substring(0, this._terminal.cols);
      lineIndex++;
    } while (lineWrapsToNext);

@@ -81,6 +81,9 @@ describe('search addon', () => {
      expect(hello3).eql(undefined);
      expect(llo).eql(undefined);
      expect(goodbye).eql({col: 0, row: 5, term: 'goodbye'});
+      term.core.resize(9, 5);
+      const hello0Resize = term.searchHelper.findInLine('Hello', 0);
+      expect(hello0Resize).eql({col: 8, row: 0, term: 'Hello'});
    });
    it('should respect search regex', () => {
      search.apply(<any>MockTerminal);