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

do not treat class declarations as nodes that start lexical environment

Browse Source
This commit is contained in:
Vladimir Matveev
2016-03-28 12:54:37 -07:00
parent 8e1d5d9c6e
commit f0523346d7
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/compiler/transformers/es6.ts
View File

@@ -189,6 +189,16 @@ namespace ts {
}
function visitor(node: Node): VisitResult<Node> {
return saveStateAndInvoke(node, dispatcher);
}
function dispatcher(node: Node): VisitResult<Node> {
return convertedLoopState
? visitorForConvertedLoopWorker(node)
: visitorWorker(node);
}
function saveStateAndInvoke<T>(node: Node, f: (node: Node) => T): T {
const savedContainingNonArrowFunction = containingNonArrowFunction;
const savedCurrentParent = currentParent;
const savedCurrentNode = currentNode;
@@ -196,16 +206,13 @@ namespace ts {
const savedEnclosingBlockScopeContainerParent = enclosingBlockScopeContainerParent;
const savedConvertedLoopState = convertedLoopState;
if (nodeStartsNewLexicalEnvironment(node) || isClassLike(node)) {
if (nodeStartsNewLexicalEnvironment(node)) {
// don't treat content of nodes that start new lexical environment or class-like nodes as part of converted loop copy
convertedLoopState = undefined;
}
onBeforeVisitNode(node);
const visited = convertedLoopState
? visitorForConvertedLoopWorker(node)
: visitorWorker(node);
const visited = f(node);
convertedLoopState = savedConvertedLoopState;
containingNonArrowFunction = savedContainingNonArrowFunction;
@@ -237,7 +244,7 @@ namespace ts {
function visitorForConvertedLoopWorker(node: Node): VisitResult<Node> {
const savedUseCapturedThis = useCapturedThis;
if (nodeStartsNewLexicalEnvironment(node) || isClassLike(node)) {
if (nodeStartsNewLexicalEnvironment(node)) {
useCapturedThis = false
}
@@ -703,13 +710,22 @@ namespace ts {
addDefaultSuperCallIfNeeded(statements, constructor, hasExtendsClause, hasSynthesizedSuper);
if (constructor) {
addRange(statements, visitNodes(constructor.body.statements, visitor, isStatement, hasSynthesizedSuper ? 1 : 0));
const body = saveStateAndInvoke(constructor, hasSynthesizedSuper ? transformConstructorBodyWithSynthesizedSuper : transformConstructorBodyWithoutSynthesizedSuper);
addRange(statements, body);
}
addRange(statements, endLexicalEnvironment());
return createBlock(statements, /*location*/ constructor && constructor.body, /*multiLine*/ true);
}
function transformConstructorBodyWithSynthesizedSuper(node: ConstructorDeclaration) {
return visitNodes(node.body.statements, visitor, isStatement, 1);
}
function transformConstructorBodyWithoutSynthesizedSuper(node: ConstructorDeclaration) {
return visitNodes(node.body.statements, visitor, isStatement, 0);
}
/**
* Adds a synthesized call to `_super` if it is needed.
*
@@ -1141,7 +1157,7 @@ namespace ts {
/*asteriskToken*/ undefined,
name,
visitNodes(node.parameters, visitor, isParameter),
transformFunctionBody(node),
saveStateAndInvoke(node, transformFunctionBody),
location,
/*original*/ node
);
@@ -2483,6 +2499,7 @@ namespace ts {
return containingNonArrowFunction
&& isClassElement(containingNonArrowFunction)
&& !hasModifier(containingNonArrowFunction, ModifierFlags.Static)
&& currentParent.kind !== SyntaxKind.CallExpression
? createPropertyAccess(createIdentifier("_super"), "prototype")
: createIdentifier("_super");
}