Fix newline normalization in search for \n\n

roblourens · roblourens · commit 88bea3fac3ca · 2019-12-13T15:36:20.000-08:00
Fix microsoft#86935
diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
@@ -533,7 +533,7 @@ export type IRgBytesOrText = { bytes: string } | { text: string };
 export function fixRegexNewline(pattern: string): string {
 	// Replace an unescaped $ at the end of the pattern with \r?$
 	// Match $ preceeded by none or even number of literal \
-	return pattern.replace(/([^\\]|^)(\\\\)*\\n/g, '$1$2\\r?\\n');
+	return pattern.replace(/(?<=[^\\]|^)(\\\\)*\\n/g, '$1\\r?\\n');
 }
 
 export function fixNewline(pattern: string): string {
diff --git a/src/vs/workbench/services/search/test/node/ripgrepTextSearchEngine.test.ts b/src/vs/workbench/services/search/test/node/ripgrepTextSearchEngine.test.ts
@@ -27,7 +27,7 @@ suite('RipgrepTextSearchEngine', () => {
 		assert.equal(unicodeEscapesToPCRE2(''), '');
 	});
 
-	test('fixRegexNewline', () => {
+	test.only('fixRegexNewline', () => {
 		function testFixRegexNewline([inputReg, testStr, shouldMatch]: [string, string, boolean]): void {
 			const fixed = fixRegexNewline(inputReg);
 			const reg = new RegExp(fixed);
@@ -38,6 +38,8 @@ suite('RipgrepTextSearchEngine', () => {
 			['foo', 'foo', true],
 
 			['foo\\n', 'foo\r\n', true],
+			['foo\\n\\n', 'foo\n\n', true],
+			['foo\\n\\n', 'foo\r\n\r\n', true],
 			['foo\\n', 'foo\n', true],
 			['foo\\nabc', 'foo\r\nabc', true],
 			['foo\\nabc', 'foo\nabc', true],

Original file line number	Diff line number	Diff line change
`@@ -533,7 +533,7 @@ export type IRgBytesOrText = { bytes: string } \| { text: string };`
`533`	`533`	`export function fixRegexNewline(pattern: string): string {`
`534`	`534`	`// Replace an unescaped $ at the end of the pattern with \r?$`
`535`	`535`	`// Match $ preceeded by none or even number of literal \`
`536`		`- return pattern.replace(/([^\\]\|^)(\\\\)*\\n/g, '$1$2\\r?\\n');`
	`536`	`+ return pattern.replace(/(?<=[^\\]\|^)(\\\\)*\\n/g, '$1\\r?\\n');`
`537`	`537`	`}`
`538`	`538`
`539`	`539`	`export function fixNewline(pattern: string): string {`