Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up variable names and conditions in checkIdentifier

Browse Source
This commit is contained in:
Ron Buckton
2016-01-27 16:33:45 -08:00
parent 1bb96555da
commit 098d59c954
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/checker.ts
+6 -7
View File
@@ -7192,19 +7192,18 @@ namespace ts {
markAliasSymbolAsReferenced(symbol);
}
const localSymbol = getExportSymbolOfValueSymbolIfExported(symbol);
const localOrExportSymbol = getExportSymbolOfValueSymbolIfExported(symbol);
// Due to the emit for class decorators, any reference to the class from inside of the class body
// must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
// behavior of class names in ES6.
if (languageVersion === ScriptTarget.ES6
&& localSymbol
&& localSymbol.valueDeclaration
&& localSymbol.valueDeclaration.kind === SyntaxKind.ClassDeclaration
&& nodeIsDecorated(localSymbol.valueDeclaration)) {
&& localOrExportSymbol.flags & SymbolFlags.Class
&& localOrExportSymbol.valueDeclaration.kind === SyntaxKind.ClassDeclaration
&& nodeIsDecorated(localOrExportSymbol.valueDeclaration)) {
let container = getContainingClass(node);
while (container !== undefined) {
if (container === localSymbol.valueDeclaration && container.name !== node) {
if (container === localOrExportSymbol.valueDeclaration && container.name !== node) {
getNodeLinks(container).flags |= NodeCheckFlags.ClassWithBodyScopedClassBinding;
getNodeLinks(node).flags |= NodeCheckFlags.BodyScopedClassBinding;
break;
@@ -7218,7 +7217,7 @@ namespace ts {
checkCollisionWithCapturedThisVariable(node, node);
checkNestedBlockScopedBinding(node, symbol);
return getNarrowedTypeOfSymbol(localSymbol, node);
return getNarrowedTypeOfSymbol(localOrExportSymbol, node);
}
function isInsideFunction(node: Node, threshold: Node): boolean {