Merge pull request microsoft#314 from Tyriar/278_blank_line_regex

Enable regex's ^, $ and ^$ to be matched in file dialog
postsql · Nov 23, 2015 · cef9583 · cef9583
2 parents 2543816 + c10aa8e
commit cef9583
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 5 deletions.
diff --git a/src/vs/base/common/strings.ts b/src/vs/base/common/strings.ts
@@ -262,9 +262,14 @@ export function createRegExp(searchString: string, isRegex: boolean, matchCase:
 }
 
 export function regExpLeadsToEndlessLoop(regexp: RegExp): boolean {
+	// Exit early if it's one of these special cases which are meant to match
+	// against an empty string
+	if (regexp.source === "^" || regexp.source === "^$" || regexp.source === "$") {
+		return false;
+	}
+
 	// We check against an empty string. If the regular expression doesn't advance
 	// (e.g. ends in an endless loop) it will match an empty string.
-
 	var match = regexp.exec('');
 	return (match && <any>regexp.lastIndex === 0);
 }
@@ -599,4 +604,4 @@ export var UTF8_BOM_CHARACTER = String.fromCharCode(__utf8_bom);
 
 export function startsWithUTF8BOM(str: string): boolean {
 	return (str && str.length > 0 && str.charCodeAt(0) === __utf8_bom);
-}
+}
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
@@ -979,10 +979,17 @@ export class TextModel extends OrderGuaranteeEventEmitter implements EditorCommo
 
 	private _findMatchesInLine(searchRegex:RegExp, text:string, lineNumber:number, deltaOffset:number, counter:number, result:EditorCommon.IEditorRange[], limitResultCount:number): number {
 		var m:RegExpExecArray;
+		// Reset regex to search from the beginning
+		searchRegex.lastIndex = 0;
 		do {
 			m = searchRegex.exec(text);
 			if (m) {
-				result.push(new Range(lineNumber, m.index + 1 + deltaOffset, lineNumber, m.index + 1 + m[0].length + deltaOffset));
+				var range = new Range(lineNumber, m.index + 1 + deltaOffset, lineNumber, m.index + 1 + m[0].length + deltaOffset);
+				// Exit early if the regex matches the same range
+				if (range.equalsRange(result[result.length - 1])) {
+					return counter;
+				}
+				result.push(range);
 				counter++;
 				if (counter >= limitResultCount) {
 					return counter;
@@ -991,4 +998,4 @@ export class TextModel extends OrderGuaranteeEventEmitter implements EditorCommo
 		} while(m);
 		return counter;
 	}
-}
+}
diff --git a/src/vs/editor/test/common/model/model.test.ts b/src/vs/editor/test/common/model/model.test.ts
@@ -603,5 +603,55 @@ suite('Editor Model - Find', () => {
 			rangeEqual(matches[i], ranges[i][0], ranges[i][1], ranges[i][2], ranges[i][3]);
 		}
 	});
-});
 
+	test('/^/ find', () => {
+		var ranges = [
+			[1, 1, 1, 1],
+			[2, 1, 2, 1],
+			[3, 1, 3, 1],
+			[4, 1, 4, 1],
+			[5, 1, 5, 1]
+		];
+		var matches = thisModel.findMatches('^', false, true, false, false);
+		assert.equal(matches.length, ranges.length);
+		for (var i = 0; i < matches.length; i++) {
+			rangeEqual(matches[i], ranges[i][0], ranges[i][1], ranges[i][2], ranges[i][3]);
+		}
+	});
+
+	test('/$/ find', () => {
+		var ranges = [
+			[1, 74, 1, 74],
+			[2, 69, 2, 69],
+			[3, 54, 3, 54],
+			[4, 65, 4, 65],
+			[5, 31, 5, 31]
+		];
+		var matches = thisModel.findMatches('$', false, true, false, false);
+		assert.equal(matches.length, ranges.length);
+		for (var i = 0; i < matches.length; i++) {
+			rangeEqual(matches[i], ranges[i][0], ranges[i][1], ranges[i][2], ranges[i][3]);
+		}
+	});
+
+	test('/^$/ find', () => {
+		var text = [
+			'This is some foo - bar text which contains foo and bar - as in Barcelona.',
+			'',
+			'And here\'s a dull line with nothing interesting in it',
+			'',
+			'Again nothing interesting here'
+		];
+		thisModel = new Model.Model(text.join('\n'), null);
+
+		var ranges = [
+			[2, 1, 2, 1],
+			[4, 1, 4, 1]
+		];
+		var matches = thisModel.findMatches('^$', false, true, false, false);
+		assert.equal(matches.length, ranges.length);
+		for (var i = 0; i < matches.length; i++) {
+			rangeEqual(matches[i], ranges[i][0], ranges[i][1], ranges[i][2], ranges[i][3]);
+		}
+	});
+});