Stop limiting getEscapedNameForExportDefault to the first declaration

amcasey · amcasey · commit 18f9d693fe65 · 2018-01-05T16:29:53.000-08:00
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
@@ -789,9 +789,7 @@ namespace ts.codefix {
             }
 
             function getEscapedNameForExportDefault(symbol: Symbol): __String | undefined {
-                const declarations = symbol.declarations;
-                if (length(declarations) > 0) {
-                    const declaration = declarations[0];
+                return firstDefined(symbol.declarations, declaration => {
                     if (isExportAssignment(declaration)) {
                         if (isIdentifier(declaration.expression)) {
                             return declaration.expression.escapedText;
@@ -803,7 +801,7 @@ namespace ts.codefix {
                             return declaration.propertyName.escapedText;
                         }
                     }
-                }
+                });
             }
         });
 

Original file line number	Diff line number	Diff line change
`@@ -789,9 +789,7 @@ namespace ts.codefix {`
`789`	`789`	`}`
`790`	`790`
`791`	`791`	`function getEscapedNameForExportDefault(symbol: Symbol): __String \| undefined {`
`792`		`- const declarations = symbol.declarations;`
`793`		`- if (length(declarations) > 0) {`
`794`		`- const declaration = declarations[0];`
	`792`	`+ return firstDefined(symbol.declarations, declaration => {`
`795`	`793`	`if (isExportAssignment(declaration)) {`
`796`	`794`	`if (isIdentifier(declaration.expression)) {`
`797`	`795`	`return declaration.expression.escapedText;`
`@@ -803,7 +801,7 @@ namespace ts.codefix {`
`803`	`801`	`return declaration.propertyName.escapedText;`
`804`	`802`	`}`
`805`	`803`	`}`
`806`		`- }`
	`804`	`+ });`
`807`	`805`	`}`
`808`	`806`	`});`
`809`	`807`