Convert globs to NFD on Mac (microsoft#24074)

chrmarti · chrmarti · commit 783df422b9f0 · 2017-09-12T22:16:48.000-07:00
diff --git a/src/vs/base/common/strings.ts b/src/vs/base/common/strings.ts
@@ -238,9 +238,19 @@ export function regExpLeadsToEndlessLoop(regexp: RegExp): boolean {
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/normalize}
  */
 export const canNormalize = typeof ((<any>'').normalize) === 'function';
-const nonAsciiCharactersPattern = /[^\u0000-\u0080]/;
-const normalizedCache = new BoundedMap<string>(10000); // bounded to 10000 elements
+
+const nfcCache = new BoundedMap<string>(10000); // bounded to 10000 elements
 export function normalizeNFC(str: string): string {
+	return normalize(str, 'NFC', nfcCache);
+}
+
+const nfdCache = new BoundedMap<string>(10000); // bounded to 10000 elements
+export function normalizeNFD(str: string): string {
+	return normalize(str, 'NFD', nfdCache);
+}
+
+const nonAsciiCharactersPattern = /[^\u0000-\u0080]/;
+function normalize(str: string, form: string, normalizedCache: BoundedMap<string>): string {
 	if (!canNormalize || !str) {
 		return str;
 	}
@@ -252,7 +262,7 @@ export function normalizeNFC(str: string): string {
 
 	let res: string;
 	if (nonAsciiCharactersPattern.test(str)) {
-		res = (<any>str).normalize('NFC');
+		res = (<any>str).normalize(form);
 	} else {
 		res = str;
 	}
diff --git a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
@@ -6,7 +6,9 @@
 import * as cp from 'child_process';
 import { rgPath } from 'vscode-ripgrep';
 
+import { isMacintosh as isMac } from 'vs/base/common/platform';
 import * as glob from 'vs/base/common/glob';
+import { normalizeNFD } from 'vs/base/common/strings';
 
 import { IFolderSearch } from './search';
 import { foldersToIncludeGlobs, foldersToRgExcludeGlobs } from './ripgrepTextSearch';
@@ -24,14 +26,14 @@ function getRgArgs(folderQuery: IFolderSearch, includePattern: glob.IExpression,
 
 	// includePattern can't have siblingClauses
 	foldersToIncludeGlobs([folderQuery], includePattern, false).forEach(globArg => {
-		args.push('-g', globArg);
+		args.push('-g', isMac ? normalizeNFD(globArg) : globArg);
 	});
 
 	let siblingClauses: glob.IExpression;
 
 	const rgGlobs = foldersToRgExcludeGlobs([folderQuery], excludePattern, undefined, false);
 	rgGlobs.globArgs
-		.forEach(rgGlob => args.push('-g', `!${rgGlob}`));
+		.forEach(rgGlob => args.push('-g', `!${isMac ? normalizeNFD(rgGlob) : rgGlob}`));
 	siblingClauses = rgGlobs.siblingClauses;
 
 	// Don't use .gitignore or .ignore
diff --git a/src/vs/workbench/services/search/test/node/search.test.ts b/src/vs/workbench/services/search/test/node/search.test.ts
@@ -234,24 +234,24 @@ suite('FileSearchEngine', () => {
 		});
 	});
 
-	// test('Files: *.* exclude with unicode', function (done: () => void) {
-	// 	let engine = new FileSearchEngine({
-	// 		folderQueries: ROOT_FOLDER_QUERY,
-	// 		filePattern: '*.*',
-	// 		excludePattern: { '**/üm laut汉语': true }
-	// 	});
+	test('Files: *.* exclude with unicode', function (done: () => void) {
+		let engine = new FileSearchEngine({
+			folderQueries: ROOT_FOLDER_QUERY,
+			filePattern: '*.*',
+			excludePattern: { '**/üm laut汉语': true }
+		});
 
-	// 	let count = 0;
-	// 	engine.search((result) => {
-	// 		if (result) {
-	// 			count++;
-	// 		}
-	// 	}, () => { }, (error) => {
-	// 		assert.ok(!error);
-	// 		assert.equal(count, 13);
-	// 		done();
-	// 	});
-	// });
+		let count = 0;
+		engine.search((result) => {
+			if (result) {
+				count++;
+			}
+		}, () => { }, (error) => {
+			assert.ok(!error);
+			assert.equal(count, 13);
+			done();
+		});
+	});
 
 	test('Files: multiroot with exclude', function (done: () => void) {
 		const folderQueries: IFolderSearch[] = [
