Fix top level detection in the Parser

ooflorent · ooflorent · commit a8b32acad594 · 2018-04-06T09:40:37.000+02:00
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -1060,9 +1060,10 @@ class Parser extends Tapable {
 	}
 
 	walkFunctionDeclaration(statement) {
+		const wasTopLevel = this.scope.topLevelScope;
+		this.scope.topLevelScope = false;
 		for (const param of statement.params) this.walkPattern(param);
 		this.inScope(statement.params, () => {
-			this.scope.topLevelScope = false;
 			if (statement.body.type === "BlockStatement") {
 				this.detectStrictMode(statement.body.body);
 				this.prewalkStatement(statement.body);
@@ -1071,6 +1072,7 @@ class Parser extends Tapable {
 				this.walkExpression(statement.body);
 			}
 		});
+		this.scope.topLevelScope = wasTopLevel;
 	}
 
 	prewalkImportDeclaration(statement) {
@@ -1465,9 +1467,10 @@ class Parser extends Tapable {
 	}
 
 	walkFunctionExpression(expression) {
+		const wasTopLevel = this.scope.topLevelScope;
+		this.scope.topLevelScope = false;
 		for (const param of expression.params) this.walkPattern(param);
 		this.inScope(expression.params, () => {
-			this.scope.topLevelScope = false;
 			if (expression.body.type === "BlockStatement") {
 				this.detectStrictMode(expression.body.body);
 				this.prewalkStatement(expression.body);
@@ -1476,6 +1479,7 @@ class Parser extends Tapable {
 				this.walkExpression(expression.body);
 			}
 		});
+		this.scope.topLevelScope = wasTopLevel;
 	}
 
 	walkArrowFunctionExpression(expression) {
@@ -1621,10 +1625,10 @@ class Parser extends Tapable {
 				}
 				this.walkExpression(argOrThis);
 			};
+			const wasTopLevel = this.scope.topLevelScope;
+			this.scope.topLevelScope = false;
 			const params = functionExpression.params;
-			const renameThis = currentThis
-				? renameArgOrThis.call(this, currentThis)
-				: null;
+			const renameThis = currentThis ? renameArgOrThis(currentThis) : null;
 			const args = options.map(renameArgOrThis);
 			this.inScope(params.filter((identifier, idx) => !args[idx]), () => {
 				if (renameThis) {
@@ -1641,6 +1645,7 @@ class Parser extends Tapable {
 					this.walkStatement(functionExpression.body);
 				} else this.walkExpression(functionExpression.body);
 			});
+			this.scope.topLevelScope = wasTopLevel;
 		};
 		if (
 			expression.callee.type === "MemberExpression" &&
@@ -1652,8 +1657,7 @@ class Parser extends Tapable {
 			expression.arguments.length > 0
 		) {
 			// (function(…) { }.call/bind(?, …))
-			walkIIFE.call(
-				this,
+			walkIIFE(
 				expression.callee.object,
 				expression.arguments.slice(1),
 				expression.arguments[0]
@@ -1663,7 +1667,7 @@ class Parser extends Tapable {
 			expression.arguments
 		) {
 			// (function(…) { }(…))
-			walkIIFE.call(this, expression.callee, expression.arguments);
+			walkIIFE(expression.callee, expression.arguments, null);
 		} else if (expression.callee.type === "Import") {
 			result = this.hooks.importCall.call(expression);
 			if (result === true) return;
