From bcf223e23599b1151cea93a19abd97d5494e3bfe Mon Sep 17 00:00:00 2001 From: Alex Ross Date: Mon, 10 Sep 2018 10:43:03 -0700 Subject: [PATCH] Fixed merge errors --- src/addons/search/SearchHelper.ts | 3 ++- src/addons/search/search.test.ts | 9 +-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/addons/search/SearchHelper.ts b/src/addons/search/SearchHelper.ts index 0ee5ad12cd..207e566b01 100644 --- a/src/addons/search/SearchHelper.ts +++ b/src/addons/search/SearchHelper.ts @@ -113,7 +113,8 @@ export class SearchHelper implements ISearchHelper { if (this._terminal._core.buffer.lines.get(y).isWrapped) { return; } - const lowerStringLine = this.translateBufferLineToStringWithWrap(y, true).toLowerCase(); const lowerTerm = term.toLowerCase(); + const lowerStringLine = this.translateBufferLineToStringWithWrap(y, true).toLowerCase(); + const lowerTerm = term.toLowerCase(); let searchIndex = -1; if (searchOptions.regex) { const searchRegex = RegExp(lowerTerm, 'g'); diff --git a/src/addons/search/search.test.ts b/src/addons/search/search.test.ts index 2e0778e033..747969308f 100644 --- a/src/addons/search/search.test.ts +++ b/src/addons/search/search.test.ts @@ -13,19 +13,12 @@ class MockTerminalPlain {} class MockTerminal { private _core: any; -<<<<<<< HEAD public searchHelper: TestSearchHelper; - constructor(options: any) { - this._core = new (require('../../../lib/Terminal').Terminal)(options); - this.searchHelper = new TestSearchHelper(this as any); -======= - public searchHelper: ISearchHelper; public cols: number; constructor(options: any) { this._core = new (require('../../../lib/Terminal').Terminal)(options); - this.searchHelper = new SearchHelper(this as any); + this.searchHelper = new TestSearchHelper(this as any); this.cols = options.cols; ->>>>>>> Fixed issues around searching lines twice and considering a wrapped line both it's own line and part of the previous line. } get core(): any { return this._core;