From fed579238a70bd5eaad097454dc796b92a388432 Mon Sep 17 00:00:00 2001
From: Alex Ross
Date: Thu, 6 Sep 2018 14:24:32 -0700
Subject: [PATCH 1/4] Added optional case sensitive searching
---
demo/client.ts | 4 ++--
demo/index.html | 1 +
src/addons/search/SearchHelper.ts | 15 +++++++++------
src/addons/search/search.test.ts | 12 ++++++++++++
4 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/demo/client.ts b/demo/client.ts
index 099aab1411..5c477ae7ec 100644
--- a/demo/client.ts
+++ b/demo/client.ts
@@ -103,7 +103,7 @@ function createTerminal(): void {
const searchOptions = {
regex: (document.getElementById('regex') as HTMLInputElement).checked,
wholeWord: false,
- caseSensitive: false
+ caseSensitive: (document.getElementById('case-sensitive') as HTMLInputElement).checked
};
term.findNext(actionElements.findNext.value, searchOptions);
}
@@ -114,7 +114,7 @@ function createTerminal(): void {
const searchOptions = {
regex: (document.getElementById('regex') as HTMLInputElement).checked,
wholeWord: false,
- caseSensitive: false
+ caseSensitive: (document.getElementById('case-sensitive') as HTMLInputElement).checked
};
term.findPrevious(actionElements.findPrevious.value, searchOptions);
}
diff --git a/demo/index.html b/demo/index.html
index ae29d135ff..553b9a8b22 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -17,6 +17,7 @@ Actions
+
diff --git a/src/addons/search/SearchHelper.ts b/src/addons/search/SearchHelper.ts
index 4cc13e632e..90df0567e4 100644
--- a/src/addons/search/SearchHelper.ts
+++ b/src/addons/search/SearchHelper.ts
@@ -113,18 +113,21 @@ 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();
- let searchIndex = -1;
+
+ const stringLIne = this.translateBufferLineToStringWithWrap(y, true);
+ const searchStringLine = searchOptions.caseSensitive ? stringLIne : stringLIne.toLowerCase();
+ const searchTerm = searchOptions.caseSensitive ? term : term.toLowerCase();
+ let searchIndex = searchStringLine.indexOf(searchTerm);
+
if (searchOptions.regex) {
- const searchRegex = RegExp(lowerTerm, 'g');
- const foundTerm = searchRegex.exec(lowerStringLine);
+ const searchRegex = RegExp(searchTerm, 'g');
+ const foundTerm = searchRegex.exec(searchStringLine);
if (foundTerm && foundTerm[0].length > 0) {
searchIndex = searchRegex.lastIndex - foundTerm[0].length;
term = foundTerm[0];
}
} else {
- searchIndex = lowerStringLine.indexOf(lowerTerm);
+ searchIndex = searchStringLine.indexOf(searchTerm);
}
if (searchIndex >= 0) {
diff --git a/src/addons/search/search.test.ts b/src/addons/search/search.test.ts
index 014b01d861..8c3f137307 100644
--- a/src/addons/search/search.test.ts
+++ b/src/addons/search/search.test.ts
@@ -117,5 +117,17 @@ describe('search addon', () => {
const line = term.searchHelper.findInLine('^.*$', 0, { regex: true });
expect(line).eql(undefined);
});
+ it('should respect case sensitive', function(): void {
+ search.apply(
MockTerminal);
+ const term = new MockTerminal({cols: 20, rows: 4});
+ term.core.write('Hello World\r\n123....hello\r\nmoreTestHello');
+ term.pushWriteData();
+ const hello0 = (term.searchHelper as any)._findInLine('Hello', 0, true);
+ const hello1 = (term.searchHelper as any)._findInLine('Hello', 1, true);
+ const hello2 = (term.searchHelper as any)._findInLine('Hello', 2, true);
+ expect(hello0).eql({col: 0, row: 0, term: 'Hello'});
+ expect(hello1).eql(undefined);
+ expect(hello2).eql({col: 8, row: 2, term: 'Hello'});
+ });
});
});
From 16de86f5ea839ebaf346650701a550fc78e620cb Mon Sep 17 00:00:00 2001
From: Alex Ross
Date: Mon, 10 Sep 2018 13:34:28 -0700
Subject: [PATCH 2/4] Fixed an unintentionally capitalized i
---
src/addons/search/SearchHelper.ts | 4 ++--
src/addons/search/search.test.ts | 11 ++++++++---
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/addons/search/SearchHelper.ts b/src/addons/search/SearchHelper.ts
index 90df0567e4..6d82b84018 100644
--- a/src/addons/search/SearchHelper.ts
+++ b/src/addons/search/SearchHelper.ts
@@ -114,8 +114,8 @@ export class SearchHelper implements ISearchHelper {
return;
}
- const stringLIne = this.translateBufferLineToStringWithWrap(y, true);
- const searchStringLine = searchOptions.caseSensitive ? stringLIne : stringLIne.toLowerCase();
+ const stringLine = this.translateBufferLineToStringWithWrap(y, true);
+ const searchStringLine = searchOptions.caseSensitive ? stringLine : stringLine.toLowerCase();
const searchTerm = searchOptions.caseSensitive ? term : term.toLowerCase();
let searchIndex = searchStringLine.indexOf(searchTerm);
diff --git a/src/addons/search/search.test.ts b/src/addons/search/search.test.ts
index 8c3f137307..56dd0d676d 100644
--- a/src/addons/search/search.test.ts
+++ b/src/addons/search/search.test.ts
@@ -122,9 +122,14 @@ describe('search addon', () => {
const term = new MockTerminal({cols: 20, rows: 4});
term.core.write('Hello World\r\n123....hello\r\nmoreTestHello');
term.pushWriteData();
- const hello0 = (term.searchHelper as any)._findInLine('Hello', 0, true);
- const hello1 = (term.searchHelper as any)._findInLine('Hello', 1, true);
- const hello2 = (term.searchHelper as any)._findInLine('Hello', 2, true);
+ const searchOptions = {
+ regex: false,
+ wholeWord: false,
+ caseSensitive: true
+ };
+ const hello0 = (term.searchHelper as any)._findInLine('Hello', 0, searchOptions);
+ const hello1 = (term.searchHelper as any)._findInLine('Hello', 1, searchOptions);
+ const hello2 = (term.searchHelper as any)._findInLine('Hello', 2, searchOptions);
expect(hello0).eql({col: 0, row: 0, term: 'Hello'});
expect(hello1).eql(undefined);
expect(hello2).eql({col: 8, row: 2, term: 'Hello'});
From ade3e0943c9b48588c76183bd69f4ac94a915adf Mon Sep 17 00:00:00 2001
From: Alex Ross
Date: Mon, 10 Sep 2018 13:54:29 -0700
Subject: [PATCH 3/4] Fixed a merge mistake
---
src/addons/search/SearchHelper.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/addons/search/SearchHelper.ts b/src/addons/search/SearchHelper.ts
index 6d82b84018..2db4953f6b 100644
--- a/src/addons/search/SearchHelper.ts
+++ b/src/addons/search/SearchHelper.ts
@@ -117,7 +117,7 @@ export class SearchHelper implements ISearchHelper {
const stringLine = this.translateBufferLineToStringWithWrap(y, true);
const searchStringLine = searchOptions.caseSensitive ? stringLine : stringLine.toLowerCase();
const searchTerm = searchOptions.caseSensitive ? term : term.toLowerCase();
- let searchIndex = searchStringLine.indexOf(searchTerm);
+ let searchIndex = -1;
if (searchOptions.regex) {
const searchRegex = RegExp(searchTerm, 'g');
From 7d2bdacf77ba0258bd0e8f5cc18c4855a93a4a89 Mon Sep 17 00:00:00 2001
From: Alex Ross
Date: Tue, 11 Sep 2018 15:48:24 -0700
Subject: [PATCH 4/4] Added test case for when regex and case sensitive are
both selected
---
src/addons/search/search.test.ts | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/src/addons/search/search.test.ts b/src/addons/search/search.test.ts
index 56dd0d676d..a96f7d016e 100644
--- a/src/addons/search/search.test.ts
+++ b/src/addons/search/search.test.ts
@@ -134,5 +134,30 @@ describe('search addon', () => {
expect(hello1).eql(undefined);
expect(hello2).eql({col: 8, row: 2, term: 'Hello'});
});
+ it('should respect case sensitive + regex', function(): void {
+ search.apply(MockTerminal);
+ const term = new MockTerminal({cols: 20, rows: 4});
+ term.core.write('hellohello\r\nHelloHello');
+ term.pushWriteData();
+
+ /**
+ * hellohello
+ * HelloHello
+ */
+
+ const searchOptions = {
+ regex: true,
+ wholeWord: false,
+ caseSensitive: true
+ };
+ const hello0 = (term.searchHelper as any)._findInLine('Hello', 0, searchOptions);
+ const hello1 = (term.searchHelper as any)._findInLine('Hello$', 0, searchOptions);
+ const hello2 = (term.searchHelper as any)._findInLine('Hello', 1, searchOptions);
+ const hello3 = (term.searchHelper as any)._findInLine('Hello$', 1, searchOptions);
+ expect(hello0).eql(undefined);
+ expect(hello1).eql(undefined);
+ expect(hello2).eql({col: 0, row: 1, term: 'Hello'});
+ expect(hello3).eql({col: 5, row: 1, term: 'Hello'});
+ });
});
});