microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-27 04:48:33 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

fix(40817): suggest import for default exported alias (#40845)

Browse Source
This commit is contained in:
Alex T
2020-10-06 19:52:35 +03:00
committed by GitHub
parent a21003dbf8
commit 5c55fc0a21
3 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/services/codefixes/importFixes.ts
View File

@@ -239,7 +239,7 @@ namespace ts.codefix {
}
const defaultInfo = getDefaultLikeExportInfo(importingFile, moduleSymbol, checker, compilerOptions);
if (defaultInfo && defaultInfo.name === symbolName && skipAlias(defaultInfo.symbol, checker) === exportedSymbol) {
if (defaultInfo && (defaultInfo.name === symbolName || moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target) === symbolName) && skipAlias(defaultInfo.symbol, checker) === exportedSymbol) {
result.push({ moduleSymbol, importKind: defaultInfo.kind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(defaultInfo.symbol, checker) });
}
@@ -556,8 +556,9 @@ namespace ts.codefix {
const checker = program.getTypeChecker();
cancellationToken.throwIfCancellationRequested();
const defaultInfo = getDefaultLikeExportInfo(sourceFile, moduleSymbol, checker, program.getCompilerOptions());
if (defaultInfo && defaultInfo.name === symbolName && symbolHasMeaning(defaultInfo.symbolForMeaning, currentTokenMeaning)) {
const compilerOptions = program.getCompilerOptions();
const defaultInfo = getDefaultLikeExportInfo(sourceFile, moduleSymbol, checker, compilerOptions);
if (defaultInfo && (defaultInfo.name === symbolName || moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target) === symbolName) && symbolHasMeaning(defaultInfo.symbolForMeaning, currentTokenMeaning)) {
addSymbol(moduleSymbol, defaultInfo.symbol, defaultInfo.kind, checker);
}
@@ -628,7 +629,7 @@ namespace ts.codefix {
defaultExport.escapedName !== InternalSymbolName.ExportEquals) {
return { symbolForMeaning: defaultExport, name: defaultExport.getName() };
}
return { symbolForMeaning: defaultExport, name: moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target!) };
return { symbolForMeaning: defaultExport, name: moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target) };
}
function getNameForExportDefault(symbol: Symbol): string | undefined {
@@ -937,11 +938,11 @@ namespace ts.codefix {
|| (!!globalCachePath && startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent));
}
export function moduleSymbolToValidIdentifier(moduleSymbol: Symbol, target: ScriptTarget): string {
export function moduleSymbolToValidIdentifier(moduleSymbol: Symbol, target: ScriptTarget | undefined): string {
return moduleSpecifierToValidIdentifier(removeFileExtension(stripQuotes(moduleSymbol.name)), target);
}
export function moduleSpecifierToValidIdentifier(moduleSpecifier: string, target: ScriptTarget): string {
export function moduleSpecifierToValidIdentifier(moduleSpecifier: string, target: ScriptTarget | undefined): string {
const baseName = getBaseFileName(removeSuffix(moduleSpecifier, "/index"));
let res = "";
let lastCharWasValid = true;

13
tests/cases/fourslash/importNameCodeFixDefaultExport4.ts Normal file
View File

@@ -0,0 +1,13 @@
/// <reference path="fourslash.ts" />
// @Filename: /foo.ts
////const a = () => {};
////export default a;
// @Filename: /test.ts
////[|foo|];
goTo.file("/test.ts");
verify.importFixAtPosition([`import foo from "./foo";
foo`]);

15
tests/cases/fourslash/importNameCodeFixDefaultExport5.ts Normal file
View File

@@ -0,0 +1,15 @@
/// <reference path="fourslash.ts" />
// @moduleResolution: node
// @Filename: /node_modules/hooks/useFoo.ts
////declare const _default: () => void;
////export default _default;
// @Filename: /test.ts
////[|useFoo|];
goTo.file("/test.ts");
verify.importFixAtPosition([`import useFoo from "hooks/useFoo";
useFoo`]);