Address PR: remove locales and options; use accent as default

Kanchalai Tanglertsampan · Kanchalai Tanglertsampan · commit 5b4dfcc18f44 · 2016-10-13T13:22:58.000-07:00
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -23,10 +23,6 @@ namespace ts {
     // More efficient to create a collator once and use its `compare` than to call `a.localeCompare(b)` many times.
     export const collator: { compare(a: string, b: string): number } = typeof Intl === "object" && typeof Intl.Collator === "function" ? new Intl.Collator() : undefined;
 
-    // This means "compare in a case insensitive manner but consider accentsor other diacritic marks"
-    // (e.g. a ≠ b, a ≠ á, a = A)
-    const accentSensitivity: Intl.CollatorOptions = { usage: "sort", sensitivity: "accent" };
-
     /**
      * Use this function instead of calling "String.prototype.localeCompre". This function will preform appropriate check to make sure that
      *  "typeof Intl" is correct as there are reported issues #11110  nad #11339.
@@ -1033,13 +1029,14 @@ namespace ts {
         return a < b ? Comparison.LessThan : Comparison.GreaterThan;
     }
 
-    export function compareStrings(a: string, b: string, locales?: string | string[], options?: Intl.CollatorOptions): Comparison {
+    export function compareStrings(a: string, b: string, ignoreCase?: boolean): Comparison {
         if (a === b) return Comparison.EqualTo;
         if (a === undefined) return Comparison.LessThan;
         if (b === undefined) return Comparison.GreaterThan;
-        if (options) {
+        if (ignoreCase) {
             if (collator && String.prototype.localeCompare) {
-                const result =  a.localeCompare(b, locales, options);
+                // accent means a ≠ b, a ≠ á, a = A
+                const result = a.localeCompare(b, /*locales*/ undefined, { usage: "sort", sensitivity: "accent" });
                 return result < 0 ? Comparison.LessThan : result > 0 ? Comparison.GreaterThan : Comparison.EqualTo;
             }
 
@@ -1052,7 +1049,7 @@ namespace ts {
     }
 
     export function compareStringsCaseInsensitive(a: string, b: string) {
-        return compareStrings(a, b, /*locales*/ undefined, accentSensitivity);
+        return compareStrings(a, b, /*ignoreCase*/ true);
     }
 
     function getDiagnosticFileName(diagnostic: Diagnostic): string {
@@ -1422,8 +1419,7 @@ namespace ts {
         const bComponents = getNormalizedPathComponents(b, currentDirectory);
         const sharedLength = Math.min(aComponents.length, bComponents.length);
         for (let i = 0; i < sharedLength; i++) {
-            const result = compareStrings(aComponents[i], bComponents[i],
-                /*locales*/ undefined, /*options*/ ignoreCase ? accentSensitivity : undefined);
+            const result = compareStrings(aComponents[i], bComponents[i], ignoreCase);
             if (result !== Comparison.EqualTo) {
                 return result;
             }
@@ -1445,8 +1441,7 @@ namespace ts {
         }
 
         for (let i = 0; i < parentComponents.length; i++) {
-            const result = compareStrings(parentComponents[i], childComponents[i],
-                /*locales*/ undefined, /*options*/ ignoreCase ? accentSensitivity : undefined);
+            const result = compareStrings(parentComponents[i], childComponents[i], ignoreCase);
             if (result !== Comparison.EqualTo) {
                 return false;
             }
diff --git a/src/services/navigateTo.ts b/src/services/navigateTo.ts
@@ -6,9 +6,6 @@ namespace ts.NavigateTo {
         const patternMatcher = createPatternMatcher(searchValue);
         let rawItems: RawNavigateToItem[] = [];
 
-        // This means "compare in a case insensitive manner."
-        const baseSensitivity: Intl.CollatorOptions = { sensitivity: "base" };
-
         // Search the declarations in all files and output matched NavigateToItem into array of NavigateToItem[]
         forEach(sourceFiles, sourceFile => {
             cancellationToken.throwIfCancellationRequested();
@@ -188,7 +185,7 @@ namespace ts.NavigateTo {
             // We first sort case insensitively.  So "Aaa" will come before "bar".
             // Then we sort case sensitively, so "aaa" will come before "Aaa".
             return i1.matchKind - i2.matchKind ||
-                ts.compareStrings(i1.name, i2.name, /*locales*/ undefined, /*options*/ baseSensitivity) ||
+                ts.compareStringsCaseInsensitive(i1.name, i2.name) ||
                 ts.compareStrings(i1.name, i2.name);
         }
 
