addressed PR feedback

This commit is contained in:
Vladimir Matveev
2015-03-03 23:46:51 -08:00
parent e49d51a088
commit 2a6b59a3ba

View File

@@ -1693,12 +1693,29 @@ module ts {
}
function isExistingName(location: Node, name: string) {
// 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)) {