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

Variables from different source files default to their declared type

Browse source
This commit is contained in:
Anders Hejlsberg 2016-04-19 10:04:17 -07:00
parent d28a4feeba
commit d735b7acbf
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compiler/checker.ts
View file

@ -7936,7 +7936,7 @@ namespace ts {
const declaration = localOrExportSymbol.valueDeclaration;
const defaultsToDeclaredType = !strictNullChecks || !declaration ||
declaration.kind === SyntaxKind.Parameter || isInAmbientContext(declaration) ||
getContainingFunction(declaration) !== getContainingFunction(node);
getContainingFunctionOrSourceFile(declaration) !== getContainingFunctionOrSourceFile(node);
if (defaultsToDeclaredType && !(type.flags & TypeFlags.Narrowable)) {
return type;
}

9
src/compiler/utilities.ts
View file

@ -840,6 +840,15 @@ namespace ts {
}
}
export function getContainingFunctionOrSourceFile(node: Node): FunctionLikeDeclaration | SourceFile {
while (true) {
node = node.parent;
if (isFunctionLike(node) || node.kind === SyntaxKind.SourceFile) {
return <FunctionLikeDeclaration | SourceFile>node;
}
}
}
export function getContainingClass(node: Node): ClassLikeDeclaration {
while (true) {
node = node.parent;