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

Andy · web-flow · commit e0ca8a5f39fe · 2018-03-22T13:08:58.000-07:00
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();

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ namespace ts.OrganizeImports {`
`98`	`98`	`}`
`99`	`99`	`else {`
`100`	`100`	`// List of named imports`
`101`		`- const newElements = namedBindings.elements.filter(e => isDeclarationUsed(e.propertyName \|\| e.name));`
	`101`	`+ const newElements = namedBindings.elements.filter(e => isDeclarationUsed(e.name));`
`102`	`102`	`if (newElements.length < namedBindings.elements.length) {`
`103`	`103`	`namedBindings = newElements.length`
`104`	`104`	`? updateNamedImports(namedBindings, newElements)`