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

Merge pull request #10926 from Microsoft/fix10862

Browse Source 
Fix super in down-level async method
This commit is contained in:
Ron Buckton
2016-09-14 17:15:51 -07:00
committed by GitHub
parent e9178a5975 e50105bd9e
commit 21c2c893b9
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ namespace ts {
/** Enables substitutions for block-scoped bindings. */
BlockScopedBindings = 1 << 1,
}
/**
* If loop contains block scoped binding captured in some function then loop body is converted to a function.
* Lexical bindings declared in loop initializer will be passed into the loop body function as parameters,
@@ -166,6 +167,9 @@ namespace ts {
let enclosingBlockScopeContainerParent: Node;
let containingNonArrowFunction: FunctionLikeDeclaration | ClassElement;
/** Tracks the container that determines whether `super.x` is a static. */
let superScopeContainer: FunctionLikeDeclaration | ClassElement;
/**
* Used to track if we are emitting body of the converted loop
*/
@@ -203,6 +207,7 @@ namespace ts {
function saveStateAndInvoke<T>(node: Node, f: (node: Node) => T): T {
const savedContainingNonArrowFunction = containingNonArrowFunction;
const savedSuperScopeContainer = superScopeContainer;
const savedCurrentParent = currentParent;
const savedCurrentNode = currentNode;
const savedEnclosingBlockScopeContainer = enclosingBlockScopeContainer;
@@ -219,6 +224,7 @@ namespace ts {
convertedLoopState = savedConvertedLoopState;
containingNonArrowFunction = savedContainingNonArrowFunction;
superScopeContainer = savedSuperScopeContainer;
currentParent = savedCurrentParent;
currentNode = savedCurrentNode;
enclosingBlockScopeContainer = savedEnclosingBlockScopeContainer;
@@ -414,13 +420,16 @@ namespace ts {
}
switch (currentParent.kind) {
case SyntaxKind.FunctionExpression:
case SyntaxKind.Constructor:
case SyntaxKind.MethodDeclaration:
case SyntaxKind.GetAccessor:
case SyntaxKind.SetAccessor:
case SyntaxKind.FunctionDeclaration:
case SyntaxKind.FunctionExpression:
containingNonArrowFunction = <FunctionLikeDeclaration>currentParent;
if (!(containingNonArrowFunction.emitFlags & NodeEmitFlags.AsyncFunctionBody)) {
superScopeContainer = containingNonArrowFunction;
}
break;
}
}
@@ -2820,9 +2829,9 @@ namespace ts {
* Visits the `super` keyword
*/
function visitSuperKeyword(node: PrimaryExpression): LeftHandSideExpression {
return containingNonArrowFunction
&& isClassElement(containingNonArrowFunction)
&& !hasModifier(containingNonArrowFunction, ModifierFlags.Static)
return superScopeContainer
&& isClassElement(superScopeContainer)
&& !hasModifier(superScopeContainer, ModifierFlags.Static)
&& currentParent.kind !== SyntaxKind.CallExpression
? createPropertyAccess(createIdentifier("_super"), "prototype")
: createIdentifier("_super");

20
tests/baselines/reference/asyncMethodWithSuper_es5.js
View File

@@ -69,11 +69,11 @@ var B = (function (_super) {
var a, b;
return __generator(this, function (_a) {
// call with property access
_super.x.call(this);
_super.prototype.x.call(this);
// call with element access
_super["x"].call(this);
a = _super.x;
b = _super["x"];
_super.prototype["x"].call(this);
a = _super.prototype.x;
b = _super.prototype["x"];
return [2 /*return*/];
});
});
@@ -85,15 +85,15 @@ var B = (function (_super) {
return __generator(this, function (_c) {
f = function () { };
// call with property access
_super.x.call(this);
_super.prototype.x.call(this);
// call with element access
_super["x"].call(this);
a = _super.x;
b = _super["x"];
_super.prototype["x"].call(this);
a = _super.prototype.x;
b = _super.prototype["x"];
// property access (assign)
_super.x = f;
_super.prototype.x = f;
// element access (assign)
_super["x"] = f;
_super.prototype["x"] = f;
// destructuring assign with property access
(_a = { f: f }, super.x = _a.f, _a);
// destructuring assign with element access