organizeImports: Fix bug in reference-testing for renamed import (#22797

)
microsoft · Mar 22, 2018 · e0ca8a5 · e0ca8a5
1 parent 54274a8
commit e0ca8a5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/src/harness/unittests/organizeImports.ts b/src/harness/unittests/organizeImports.ts
@@ -197,6 +197,16 @@ export const Other = 1;
                 assert.isEmpty(changes);
             });
 
+            testOrganizeImports("Renamed_used",
+                {
+                    path: "/test.ts",
+                    content: `
+import { F1 as EffOne, F2 as EffTwo } from "lib";
+EffOne();
+`,
+                },
+                libFile);
+
             testOrganizeImports("Simple",
                 {
                     path: "/test.ts",

diff --git a/src/services/organizeImports.ts b/src/services/organizeImports.ts
@@ -98,7 +98,7 @@ namespace ts.OrganizeImports {
                 }
                 else {
                     // List of named imports
-                    const newElements = namedBindings.elements.filter(e => isDeclarationUsed(e.propertyName || e.name));
+                    const newElements = namedBindings.elements.filter(e => isDeclarationUsed(e.name));
                     if (newElements.length < namedBindings.elements.length) {
                         namedBindings = newElements.length
                             ? updateNamedImports(namedBindings, newElements)

diff --git a/tests/baselines/reference/organizeImports/Renamed_used.ts b/tests/baselines/reference/organizeImports/Renamed_used.ts
@@ -0,0 +1,9 @@
+// ==ORIGINAL==
+
+import { F1 as EffOne, F2 as EffTwo } from "lib";
+EffOne();
+
+// ==ORGANIZED==
+
+import { F1 as EffOne } from "lib";
+EffOne();