Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/services/codefixes/importFixes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -414,21 +414,18 @@ namespace ts.codefix {
}

function getDefaultExportInfo(defaultExport: Symbol, moduleSymbol: Symbol, program: Program): { readonly symbolForMeaning: Symbol, readonly name: string } | undefined {
const checker = program.getTypeChecker();

const localSymbol = getLocalSymbolForExportDefault(defaultExport);
if (localSymbol) return { symbolForMeaning: localSymbol, name: localSymbol.name };

const name = getNameForExportDefault(defaultExport);
if (name !== undefined) return { symbolForMeaning: defaultExport, name };

if (defaultExport.flags & SymbolFlags.Alias) {
const aliased = checker.getAliasedSymbol(defaultExport);
return getDefaultExportInfo(aliased, Debug.assertDefined(aliased.parent), program);
const aliased = program.getTypeChecker().getImmediateAliasedSymbol(defaultExport);
return aliased && getDefaultExportInfo(aliased, Debug.assertDefined(aliased.parent), program);
}
else {
const moduleName = moduleSymbolToValidIdentifier(moduleSymbol, program.getCompilerOptions().target!);
return moduleName === undefined ? undefined : { symbolForMeaning: defaultExport, name: moduleName };
return { symbolForMeaning: defaultExport, name: moduleSymbolToValidIdentifier(moduleSymbol, program.getCompilerOptions().target!) };
}
}

Expand Down
40 changes: 40 additions & 0 deletions tests/cases/fourslash/importNameCodeFix_reExportDefault.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/// <reference path="fourslash.ts" />

// @Filename: /user.ts
////foo;

// @Filename: /user2.ts
////unnamed;

// @Filename: /reExportNamed.ts
////export { default } from "./named";

// @Filename: /reExportUnnamed.ts
////export { default } from "./unnamed";

// @Filename: /named.ts
////function foo() {}
////export default foo;

// @Filename: /unnamed.ts
////export default 0;

goTo.file("/user.ts");
verify.importFixAtPosition([
`import foo from "./named";

foo;`,
`import foo from "./reExportNamed";

foo;`,
]);

goTo.file("/user2.ts");
verify.importFixAtPosition([
`import unnamed from "./unnamed";

unnamed;`,
`import unnamed from "./reExportUnnamed";

unnamed;`,
]);