Merge pull request microsoft#24048 from amcasey/GH23366

amcasey · web-flow · commit 020d6c7ba3fa · 2018-05-10T19:11:44.000-07:00
Ignore case when sorting imports
diff --git a/src/harness/unittests/organizeImports.ts b/src/harness/unittests/organizeImports.ts
@@ -23,6 +23,15 @@ namespace ts {
                     `import x from "./lib";`);
             });
 
+            it("Sort - case-insensitive", () => {
+                assertSortsBefore(
+                    `import y from "a";`,
+                    `import x from "Z";`);
+                assertSortsBefore(
+                    `import y from "A";`,
+                    `import x from "z";`);
+            });
+
             function assertSortsBefore(importString1: string, importString2: string) {
                 const [{moduleSpecifier: moduleSpecifier1}, {moduleSpecifier: moduleSpecifier2}] = parseImports(importString1, importString2);
                 assert.equal(OrganizeImports.compareModuleSpecifiers(moduleSpecifier1, moduleSpecifier2), Comparison.LessThan);
@@ -42,6 +51,13 @@ namespace ts {
                 assertListEqual(actualCoalescedImports, expectedCoalescedImports);
             });
 
+            it("Sort specifiers - case-insensitive", () => {
+                const sortedImports = parseImports(`import { default as M, a as n, B, y, Z as O } from "lib";`);
+                const actualCoalescedImports = OrganizeImports.coalesceImports(sortedImports);
+                const expectedCoalescedImports = parseImports(`import { a as n, B, default as M, y, Z as O } from "lib";`);
+                assertListEqual(actualCoalescedImports, expectedCoalescedImports);
+            });
+
             it("Combine side-effect-only imports", () => {
                 const sortedImports = parseImports(
                     `import "lib";`,
diff --git a/src/services/organizeImports.ts b/src/services/organizeImports.ts
@@ -256,7 +256,7 @@ namespace ts.OrganizeImports {
         }
 
         function compareIdentifiers(s1: Identifier, s2: Identifier) {
-            return compareStringsCaseSensitive(s1.text, s2.text);
+            return compareStringsCaseInsensitive(s1.text, s2.text);
         }
     }
 
@@ -279,6 +279,6 @@ namespace ts.OrganizeImports {
         const name2 = getExternalModuleName(m2);
         return compareBooleans(name1 === undefined, name2 === undefined) ||
             compareBooleans(isExternalModuleNameRelative(name1), isExternalModuleNameRelative(name2)) ||
-            compareStringsCaseSensitive(name1, name2);
+            compareStringsCaseInsensitive(name1, name2);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ namespace ts.OrganizeImports {`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`function compareIdentifiers(s1: Identifier, s2: Identifier) {`
`259`		`- return compareStringsCaseSensitive(s1.text, s2.text);`
	`259`	`+ return compareStringsCaseInsensitive(s1.text, s2.text);`
`260`	`260`	`}`
`261`	`261`	`}`
`262`	`262`
`@@ -279,6 +279,6 @@ namespace ts.OrganizeImports {`
`279`	`279`	`const name2 = getExternalModuleName(m2);`
`280`	`280`	`return compareBooleans(name1 === undefined, name2 === undefined) \|\|`
`281`	`281`	`compareBooleans(isExternalModuleNameRelative(name1), isExternalModuleNameRelative(name2)) \|\|`
`282`		`- compareStringsCaseSensitive(name1, name2);`
	`282`	`+ compareStringsCaseInsensitive(name1, name2);`
`283`	`283`	`}`
`284`	`284`	`}`