fixed Sage/streamlinejs#302 - CS _this idiom

Sage · Nov 4, 2015 · 14241cc · 14241cc
1 parent f13f7b0
commit 14241cc
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/plugin.js b/lib/plugin.js
@@ -247,16 +247,20 @@ function hoist(t, scope, nodes) {
 	return hoisted.concat(other);
 }
 
+function likeThis(t, node) {
+	return t.isThisExpression(node) || (t.isIdentifier(node) && node.name === '_this');
+}
+
 function unwrapIIFE(t, node) {
 	var callee = node.callee;
 	if (t.isFunctionExpression(callee) && callee.params.length === 0 && node.arguments.length === 0) {
 		// (function() { ... })() ->  (await (async function() { ... })())
 		return callee;
 	} else if (t.isMemberExpression(callee) && t.isFunctionExpression(callee.object) && callee.object.params.length === 0) {
-		if (callee.property.name === 'call' && node.arguments.length === 1 && t.isThisExpression(node.arguments[0])) {
+		if (callee.property.name === 'call' && node.arguments.length === 1 && likeThis(t, node.arguments[0])) {
 			// (function() { ... }).call(this) ->  (await (async function(_) { ... }).call(this, _)
 			return callee.object;
-		} else if (callee.property.name === 'apply' && node.arguments.length === 2 && t.isThisExpression(node.arguments[0]) && node.arguments[1].name === 'arguments') {
+		} else if (callee.property.name === 'apply' && node.arguments.length === 2 && likeThis(t, node.arguments[0]) && node.arguments[1].name === 'arguments') {
 			// (function() { ... }).apply(this, arguments) ->  (await (async function() { ... }).apply(this, arguments))
 			return callee.object;
 		}