microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-15 03:23:08 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

References decorated classes in static functions using rename entity (#8150)

Browse Source
This commit is contained in:
Yui 2016-04-18 13:25:56 -07:00
parent 834a5eb176
commit 4e106d7aa5
1 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/compiler/transformers/ts.ts
View File

@ -1329,20 +1329,38 @@ namespace ts {
//
// The emit for the class is:
//
// C = C_1 = __decorate([dec], C);
//
if (decoratedClassAlias) {
const expression = createAssignment(
decoratedClassAlias,
createDecorateHelper(
decoratorExpressions,
getDeclarationName(node)
)
);
return createAssignment(getDeclarationName(node), expression);
}
// Emit the call to __decorate. Given the class:
//
// @dec
// export declare class C {
// }
//
// The emit for the class is:
//
// C = __decorate([dec], C);
//
const expression = createAssignment(
getDeclarationName(node),
createDecorateHelper(
decoratorExpressions,
getDeclarationName(node)
)
);
return decoratedClassAlias
? createAssignment(decoratedClassAlias, expression)
: expression;
else {
return createAssignment(
getDeclarationName(node),
createDecorateHelper(
decoratorExpressions,
getDeclarationName(node)
)
);
}
}
/**
@ -2698,8 +2716,16 @@ namespace ts {
// If we need support substitutions for aliases for decorated classes,
// we should enable it here.
if (enabledSubstitutions & TypeScriptSubstitutionFlags.DecoratedClasses && isClassWithDecorators(node)) {
currentDecoratedClassAliases[getOriginalNodeId(node)] = decoratedClassAliases[getOriginalNodeId(node)];
if (enabledSubstitutions & TypeScriptSubstitutionFlags.DecoratedClasses) {
if (isClassWithDecorators(node)) {
currentDecoratedClassAliases[getOriginalNodeId(node)] = decoratedClassAliases[getOriginalNodeId(node)];
}
else if (node.kind === SyntaxKind.Identifier) {
const declaration = resolver.getReferencedValueDeclaration(<Identifier>node)
if (declaration && isClassWithDecorators(declaration)) {
currentDecoratedClassAliases[getOriginalNodeId(declaration)] = decoratedClassAliases[getOriginalNodeId(declaration)];
}
}
}
// If we need to support substitutions for `super` in an async method,
@ -2879,6 +2905,7 @@ namespace ts {
// We need to enable substitutions for identifiers. This allows us to
// substitute class names inside of a class declaration.
context.enableExpressionSubstitution(SyntaxKind.Identifier);
context.enableEmitNotification(SyntaxKind.Identifier);
// Keep track of class aliases.
decoratedClassAliases = {};