microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-17 01:49:57 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #2194 from Microsoft/namesInNestedScopes

Browse Source 
look through the entire chain of name scopes to ensure that name is uniq...
This commit is contained in:
Vladimir Matveev
2015-03-04 00:09:52 -08:00
parent 88ac7302b0 2a6b59a3ba
commit e225999ac4
4 changed files with 136 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/compiler/emitter.ts
View File

@@ -1693,8 +1693,37 @@ module ts {
}
function isExistingName(location: Node, name: string) {
return !resolver.isUnknownIdentifier(location, name) ||
(currentScopeNames && hasProperty(currentScopeNames, name));
// check if resolver is aware of this name (if name was seen during the typecheck)
if (!resolver.isUnknownIdentifier(location, name)) {
return true;
}
// check if name is present in generated names that were introduced by the emitter
if (currentScopeNames && hasProperty(currentScopeNames, name)) {
return true;
}
// check generated names in outer scopes
// var x;
// function foo() {
// let x; // 1
// function bar() {
// {
// let x; // 2
// }
// console.log(x); // 3
// }
//}
// here both x(1) and x(2) should be renamed and their names should be different
// so x in (3) will refer to x(1)
var frame = lastFrame;
while (frame) {
if (hasProperty(frame.names, name)) {
return true;
}
frame = frame.previous;
}
return false;
}
function initializeEmitterWithSourceMaps() {