microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-18 07:29:16 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Use correct program when checking for reexports from AutoImportProviderProject (#40843)

Browse Source
This commit is contained in:
Andrew Branch
2020-09-30 09:32:19 -07:00
committed by GitHub
parent f615e229d3
commit a301001420
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -498,7 +498,7 @@ namespace ts.codefix {
const compilerOptions = program.getCompilerOptions();
const preferTypeOnlyImport = compilerOptions.importsNotUsedAsValues === ImportsNotUsedAsValues.Error && isValidTypeOnlyAliasUseSite(symbolToken);
const useRequire = shouldUseRequire(sourceFile, compilerOptions);
const exportInfos = getExportInfos(symbolName, getMeaningFromLocation(symbolToken), cancellationToken, sourceFile, checker, program, useAutoImportProvider, host);
const exportInfos = getExportInfos(symbolName, getMeaningFromLocation(symbolToken), cancellationToken, sourceFile, program, useAutoImportProvider, host);
const fixes = arrayFrom(flatMapIterator(exportInfos.entries(), ([_, exportInfos]) =>
getFixForImport(exportInfos, symbolName, symbolToken.getStart(sourceFile), preferTypeOnlyImport, useRequire, program, sourceFile, host, preferences)));
return { fixes, symbolName };
@@ -521,7 +521,6 @@ namespace ts.codefix {
currentTokenMeaning: SemanticMeaning,
cancellationToken: CancellationToken,
sourceFile: SourceFile,
checker: TypeChecker,
program: Program,
useAutoImportProvider: boolean,
host: LanguageServiceHost
@@ -529,21 +528,22 @@ namespace ts.codefix {
// For each original symbol, keep all re-exports of that symbol together so we can call `getCodeActionsForImport` on the whole group at once.
// Maps symbol id to info for modules providing that symbol (original export + re-exports).
const originalSymbolToExportInfos = createMultiMap<SymbolExportInfo>();
function addSymbol(moduleSymbol: Symbol, exportedSymbol: Symbol, importKind: ImportKind): void {
function addSymbol(moduleSymbol: Symbol, exportedSymbol: Symbol, importKind: ImportKind, checker: TypeChecker): void {
originalSymbolToExportInfos.add(getUniqueSymbolId(exportedSymbol, checker).toString(), { moduleSymbol, importKind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(exportedSymbol, checker) });
}
forEachExternalModuleToImportFrom(program, host, sourceFile, /*filterByPackageJson*/ true, useAutoImportProvider, moduleSymbol => {
forEachExternalModuleToImportFrom(program, host, sourceFile, /*filterByPackageJson*/ true, useAutoImportProvider, (moduleSymbol, _, program) => {
const checker = program.getTypeChecker();
cancellationToken.throwIfCancellationRequested();
const defaultInfo = getDefaultLikeExportInfo(sourceFile, moduleSymbol, checker, program.getCompilerOptions());
if (defaultInfo && defaultInfo.name === symbolName && symbolHasMeaning(defaultInfo.symbolForMeaning, currentTokenMeaning)) {
addSymbol(moduleSymbol, defaultInfo.symbol, defaultInfo.kind);
addSymbol(moduleSymbol, defaultInfo.symbol, defaultInfo.kind, checker);
}
// check exports with the same name
const exportSymbolWithIdenticalName = checker.tryGetMemberInModuleExportsAndProperties(symbolName, moduleSymbol);
if (exportSymbolWithIdenticalName && symbolHasMeaning(exportSymbolWithIdenticalName, currentTokenMeaning)) {
addSymbol(moduleSymbol, exportSymbolWithIdenticalName, ImportKind.Named);
addSymbol(moduleSymbol, exportSymbolWithIdenticalName, ImportKind.Named, checker);
}
});
return originalSymbolToExportInfos;

22
tests/cases/fourslash/server/autoImportProvider5.ts Normal file
View File

@@ -0,0 +1,22 @@
/// <reference path="../fourslash.ts" />
// @Filename: /package.json
//// { "dependencies": { "react-hook-form": "*" } }
// @Filename: /node_modules/react-hook-form/package.json
//// { "types": "dist/index.d.ts" }
// @Filename: /node_modules/react-hook-form/dist/index.d.ts
//// export * from "./useForm";
// @Filename: /node_modules/react-hook-form/dist/useForm.d.ts
//// export declare function useForm(): void;
// @Filename: /index.ts
//// useForm/**/
goTo.marker("");
verify.importFixAtPosition([
`import { useForm } from "react-hook-form";\r\n\r\nuseForm`,
`import { useForm } from "react-hook-form/dist/useForm";\r\n\r\nuseForm`
]);