Simplify comparers

rbuckton · rbuckton · commit c0ed26e6058f · 2017-10-25T17:46:39.000-07:00
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -6069,7 +6069,7 @@ namespace ts {
                     const checkJsDirectiveMatchResult = checkJsDirectiveRegEx.exec(comment);
                     if (checkJsDirectiveMatchResult) {
                         checkJsDirective = {
-                            enabled: StringCollator.ordinalCaseInsensitive.equate(checkJsDirectiveMatchResult[1], "@ts-check"),
+                            enabled: equateStringsCaseInsensitive(checkJsDirectiveMatchResult[1], "@ts-check"),
                             end: range.end,
                             pos: range.pos
                         };
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1103,12 +1103,12 @@ namespace ts {
             // otherwise, using options specified in '--lib' instead of '--target' default library file
 
             // File-system ordering should use a predictable order
-            const collator = StringCollator.getPathCollator(!host.useCaseSensitiveFileNames());
+            const equalityComparer = getStringEqualityComparer(!host.useCaseSensitiveFileNames());
             if (!options.lib) {
-               return collator.equate(file.fileName, getDefaultLibraryFileName());
+               return equalityComparer(file.fileName, getDefaultLibraryFileName());
             }
             else {
-                return forEach(options.lib, libFileName => collator.equate(file.fileName, combinePaths(defaultLibraryPath, libFileName)));
+                return forEach(options.lib, libFileName => equalityComparer(file.fileName, combinePaths(defaultLibraryPath, libFileName)));
             }
         }
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -3950,7 +3950,7 @@ namespace ts {
         }
 
         // Set the locale for UI collation
-        StringCollator.uiLocale = locale;
+        setUILocale(locale);
 
         function trySetLanguageAndTerritory(language: string, territory: string, errors?: Push<Diagnostic>): boolean {
             const compilerFilePath = normalizePath(sys.getExecutingFilePath());
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
@@ -1699,8 +1699,8 @@ namespace Harness {
         export function *iterateOutputs(outputFiles: Harness.Compiler.GeneratedFile[]): IterableIterator<[string, string]> {
             // Collect, test, and sort the fileNames
             // As this uses the file system, use a predictable order
-            const collator = ts.StringCollator.getPathCollator(/*ignoreCase*/ false);
-            outputFiles.sort((a, b) => collator.compare(cleanName(a.fileName), cleanName(b.fileName)));
+            const comparer = ts.getStringComparer(/*ignoreCase*/ false);
+            outputFiles.sort((a, b) => comparer(cleanName(a.fileName), cleanName(b.fileName)));
             const dupeCase = ts.createMap<number>();
             // Yield them
             for (const outputFile of outputFiles) {
diff --git a/src/harness/unittests/compileOnSave.ts b/src/harness/unittests/compileOnSave.ts
@@ -14,9 +14,9 @@ namespace ts.projectSystem {
         function sendAffectedFileRequestAndCheckResult(session: server.Session, request: server.protocol.Request, expectedFileList: { projectFileName: string, files: FileOrFolder[] }[]) {
             const response = session.executeCommand(request).response as server.protocol.CompileOnSaveAffectedFileListSingleProject[];
             // File-system ordering should use a predictable order
-            const collator = StringCollator.getPathCollator(/*ignoreCase*/ false);
-            const actualResult = response.sort((list1, list2) => collator.compare(list1.projectFileName, list2.projectFileName));
-            expectedFileList = expectedFileList.sort((list1, list2) => collator.compare(list1.projectFileName, list2.projectFileName));
+            const comparer = getStringComparer(/*ignoreCase*/ false);
+            const actualResult = response.sort((list1, list2) => comparer(list1.projectFileName, list2.projectFileName));
+            expectedFileList = expectedFileList.sort((list1, list2) => comparer(list1.projectFileName, list2.projectFileName));
 
             assert.equal(actualResult.length, expectedFileList.length, `Actual result project number is different from the expected project number`);
 
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -1186,15 +1186,14 @@ namespace ts.server {
 
             const completions = project.getLanguageService().getCompletionsAtPosition(file, position);
             if (simplifiedResult) {
-                const comparer = StringCollator.uiCaseSensitive.compare;
                 return mapDefined<CompletionEntry, protocol.CompletionEntry>(completions && completions.entries, entry => {
                     if (completions.isMemberCompletion || (entry.name.toLowerCase().indexOf(prefix.toLowerCase()) === 0)) {
                         const { name, kind, kindModifiers, sortText, replacementSpan, hasAction } = entry;
                         const convertedSpan = replacementSpan ? this.decorateSpan(replacementSpan, scriptInfo) : undefined;
                         // Use `hasAction || undefined` to avoid serializing `false`.
                         return { name, kind, kindModifiers, sortText, replacementSpan: convertedSpan, hasAction: hasAction || undefined };
                     }
-                }).sort((a, b) => comparer(a.name, b.name));
+                }).sort((a, b) => compareStringsCaseSensitiveUI(a.name, b.name));
             }
             else {
                 return completions;
diff --git a/src/services/navigateTo.ts b/src/services/navigateTo.ts
@@ -176,7 +176,7 @@ namespace ts.NavigateTo {
     function compareNavigateToItems(i1: RawNavigateToItem, i2: RawNavigateToItem): number {
         // TODO(cyrusn): get the gamut of comparisons that VS already uses here.
         return i1.matchKind - i2.matchKind ||
-            StringCollator.uiCaseSensitive.compare(i1.name, i2.name);
+            compareStringsCaseSensitiveUI(i1.name, i2.name);
     }
 
     function createNavigateToItem(rawItem: RawNavigateToItem): NavigateToItem {
diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts
@@ -368,7 +368,7 @@ namespace ts.NavigationBar {
 
     function compareChildren(child1: NavigationBarNode, child2: NavigationBarNode): number {
         const name1 = tryGetName(child1.node), name2 = tryGetName(child2.node);
-        return StringCollator.uiCaseInsensitive.compare(name1, name2)
+        return compareStringsCaseInsensitiveUI(name1, name2)
             || navigationBarNodeKind(child1) - navigationBarNodeKind(child2);
     }
 
diff --git a/src/services/refactors/extractSymbol.ts b/src/services/refactors/extractSymbol.ts
@@ -1156,7 +1156,7 @@ namespace ts.refactor.extractSymbol {
         const name2 = type2.symbol ? type2.symbol.getName() : "";
 
         // This is for code generation, use a predictable comparer.
-        const nameDiff = StringCollator.invariantCaseSensitive.compare(name1, name2);
+        const nameDiff = compareStringsCaseSensitive(name1, name2);
         if (nameDiff !== 0) {
             return nameDiff;
         }

Original file line number	Diff line number	Diff line change
`@@ -1103,12 +1103,12 @@ namespace ts {`
`1103`	`1103`	`// otherwise, using options specified in '--lib' instead of '--target' default library file`
`1104`	`1104`
`1105`	`1105`	`// File-system ordering should use a predictable order`
`1106`		`- const collator = StringCollator.getPathCollator(!host.useCaseSensitiveFileNames());`
	`1106`	`+ const equalityComparer = getStringEqualityComparer(!host.useCaseSensitiveFileNames());`
`1107`	`1107`	`if (!options.lib) {`
`1108`		`- return collator.equate(file.fileName, getDefaultLibraryFileName());`
	`1108`	`+ return equalityComparer(file.fileName, getDefaultLibraryFileName());`
`1109`	`1109`	`}`
`1110`	`1110`	`else {`
`1111`		`- return forEach(options.lib, libFileName => collator.equate(file.fileName, combinePaths(defaultLibraryPath, libFileName)));`
	`1111`	`+ return forEach(options.lib, libFileName => equalityComparer(file.fileName, combinePaths(defaultLibraryPath, libFileName)));`
`1112`	`1112`	`}`
`1113`	`1113`	`}`
`1114`	`1114`
Original file line number	Diff line number	Diff line change
`@@ -3950,7 +3950,7 @@ namespace ts {`
`3950`	`3950`	`}`
`3951`	`3951`
`3952`	`3952`	`// Set the locale for UI collation`
`3953`		`- StringCollator.uiLocale = locale;`
	`3953`	`+ setUILocale(locale);`
`3954`	`3954`
`3955`	`3955`	`function trySetLanguageAndTerritory(language: string, territory: string, errors?: Push<Diagnostic>): boolean {`
`3956`	`3956`	`const compilerFilePath = normalizePath(sys.getExecutingFilePath());`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ namespace ts.NavigateTo {`
`176`	`176`	`function compareNavigateToItems(i1: RawNavigateToItem, i2: RawNavigateToItem): number {`
`177`	`177`	`// TODO(cyrusn): get the gamut of comparisons that VS already uses here.`
`178`	`178`	`return i1.matchKind - i2.matchKind \|\|`
`179`		`- StringCollator.uiCaseSensitive.compare(i1.name, i2.name);`
	`179`	`+ compareStringsCaseSensitiveUI(i1.name, i2.name);`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`function createNavigateToItem(rawItem: RawNavigateToItem): NavigateToItem {`
Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ namespace ts.NavigationBar {`
`368`	`368`
`369`	`369`	`function compareChildren(child1: NavigationBarNode, child2: NavigationBarNode): number {`
`370`	`370`	`const name1 = tryGetName(child1.node), name2 = tryGetName(child2.node);`
`371`		`- return StringCollator.uiCaseInsensitive.compare(name1, name2)`
	`371`	`+ return compareStringsCaseInsensitiveUI(name1, name2)`
`372`	`372`	`\|\| navigationBarNodeKind(child1) - navigationBarNodeKind(child2);`
`373`	`373`	`}`
`374`	`374`
Original file line number	Diff line number	Diff line change
`@@ -1156,7 +1156,7 @@ namespace ts.refactor.extractSymbol {`
`1156`	`1156`	`const name2 = type2.symbol ? type2.symbol.getName() : "";`
`1157`	`1157`
`1158`	`1158`	`// This is for code generation, use a predictable comparer.`
`1159`		`- const nameDiff = StringCollator.invariantCaseSensitive.compare(name1, name2);`
	`1159`	`+ const nameDiff = compareStringsCaseSensitive(name1, name2);`
`1160`	`1160`	`if (nameDiff !== 0) {`
`1161`	`1161`	`return nameDiff;`
`1162`	`1162`	`}`