maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

In import code fix, don't treat a re-export as an import (#18341)

Browse source
This commit is contained in:
Andy 2017-09-09 05:52:08 -07:00 committed by GitHub
parent 409d6597eb
commit 018c645913
2 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/services/codefixes/importFixes.ts
View file

@ -133,7 +133,7 @@ namespace ts.codefix {
const symbolIdActionMap = new ImportCodeActionMap();
// this is a module id -> module import declaration map
const cachedImportDeclarations: (ImportDeclaration | ImportEqualsDeclaration)[][] = [];
const cachedImportDeclarations: AnyImportSyntax[][] = [];
let lastImportDeclaration: Node;
const currentTokenMeaning = getMeaningFromLocation(token);
@ -199,28 +199,20 @@ namespace ts.codefix {
return cached;
}
const existingDeclarations: (ImportDeclaration | ImportEqualsDeclaration)[] = [];
for (const importModuleSpecifier of sourceFile.imports) {
const importSymbol = checker.getSymbolAtLocation(importModuleSpecifier);
if (importSymbol === moduleSymbol) {
existingDeclarations.push(getImportDeclaration(importModuleSpecifier));
}
}
const existingDeclarations = mapDefined(sourceFile.imports, importModuleSpecifier =>
checker.getSymbolAtLocation(importModuleSpecifier) === moduleSymbol ? getImportDeclaration(importModuleSpecifier) : undefined);
cachedImportDeclarations[moduleSymbolId] = existingDeclarations;
return existingDeclarations;
function getImportDeclaration(moduleSpecifier: LiteralExpression) {
let node: Node = moduleSpecifier;
while (node) {
if (node.kind === SyntaxKind.ImportDeclaration) {
return <ImportDeclaration>node;
}
if (node.kind === SyntaxKind.ImportEqualsDeclaration) {
return <ImportEqualsDeclaration>node;
}
node = node.parent;
function getImportDeclaration({ parent }: LiteralExpression): AnyImportSyntax {
switch (parent.kind) {
case SyntaxKind.ImportDeclaration:
return parent as ImportDeclaration;
case SyntaxKind.ExternalModuleReference:
return (parent as ExternalModuleReference).parent;
default:
return undefined;
}
return undefined;
}
}

16
tests/cases/fourslash/importNameCodeFixReExport.ts Normal file
View file

@ -0,0 +1,16 @@
/// <reference path='fourslash.ts' />
// Test that we are not fooled by a re-export existing in the file already
// @Filename: /a.ts
////export const x = 0";
// @Filename: /b.ts
////[|export { x } from "./a";
////x;|]
goTo.file("/b.ts");
verify.rangeAfterCodeFix(`import { x } from "./a";
export { x } from "./a";
x;`, /*includeWhiteSpace*/ true);