waveterm/xterm.js
0
0
Fork 0
mirror of https://github.com/wavetermdev/xterm.js.git synced 2026-08-05 13:43:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge errors

Browse Source
This commit is contained in:
Alex Ross
2018-09-10 10:43:03 -07:00
parent d5c17a0cc9
commit bcf223e235
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/addons/search/SearchHelper.ts
+2 -1
View File
@@ -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');
src/addons/search/search.test.ts
+1 -8
View File
@@ -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;