Fixed merge errors

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
+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');