microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 21:36:50 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Check if module reference requires type reference before path reference (#25385)

Browse Source
This commit is contained in:
Wesley Wigham
2018-07-03 11:41:07 -07:00
committed by GitHub
parent 304d45d833
commit cb4cb7a75f
8 changed files with 82 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/checker.ts
View File

@@ -3747,7 +3747,7 @@ namespace ts {
const ambientDecls = filter(symbol.declarations, isAmbientModule);
if (length(ambientDecls)) {
for (const decl of ambientDecls) {
context.tracker.trackReferencedAmbientModule(decl);
context.tracker.trackReferencedAmbientModule(decl, symbol);
}
}
}

8
src/compiler/transformers/declarations.ts
View File

@@ -66,7 +66,13 @@ namespace ts {
}
}
function trackReferencedAmbientModule(node: ModuleDeclaration) {
function trackReferencedAmbientModule(node: ModuleDeclaration, symbol: Symbol) {
// If it is visible via `// <reference types="..."/>`, then we should just use that
const directives = resolver.getTypeReferenceDirectivesForSymbol(symbol, SymbolFlags.All);
if (length(directives)) {
return recordTypeReferenceDirectivesIfNecessary(directives);
}
// Otherwise we should emit a path-based reference
const container = getSourceFileOfNode(node);
refs.set("" + getOriginalNodeId(container), container);
}

2
src/compiler/types.ts
View File

@@ -5316,7 +5316,7 @@ namespace ts {
reportPrivateInBaseOfClassExpression?(propertyName: string): void;
reportInaccessibleUniqueSymbolError?(): void;
moduleResolverHost?: ModuleSpecifierResolutionHost;
trackReferencedAmbientModule?(decl: ModuleDeclaration): void;
trackReferencedAmbientModule?(decl: ModuleDeclaration, symbol: Symbol): void;
}
export interface TextSpan {