Leave top level scope when traversing Class nodes

ooflorent · ooflorent · commit b8815a941596 · 2018-01-25T09:57:47.000+01:00
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -609,9 +609,13 @@ class Parser extends Tapable {
 		if(classy.superClass)
 			this.walkExpression(classy.superClass);
 		if(classy.body && classy.body.type === "ClassBody") {
-			for(const methodDefinition of classy.body.body)
+			const wasTopLevel = this.scope.topLevelScope;
+			this.scope.topLevelScope = false;
+			for(const methodDefinition of classy.body.body) {
 				if(methodDefinition.type === "MethodDefinition")
 					this.walkMethodDefinition(methodDefinition);
+			}
+			this.scope.topLevelScope = wasTopLevel;
 		}
 	}
 
diff --git a/test/configCases/parsing/harmony-this/abc.js b/test/configCases/parsing/harmony-this/abc.js
@@ -22,6 +22,13 @@ export class C {
 	foo() {
 		return this.x;
 	}
+	bar(x = this.x) {
+		return x;
+	}
+}
+
+export const extendThisClass = () => {
+	return class extends this.Buffer {};
 }
 
 export function D() {
diff --git a/test/configCases/parsing/harmony-this/index.js b/test/configCases/parsing/harmony-this/index.js
@@ -1,6 +1,6 @@
 "use strict";
 
-import d, {a, b as B, C as _C, D as _D, returnThisArrow, returnThisMember, that} from "./abc";
+import d, {a, b as B, C as _C, D as _D, extendThisClass, returnThisArrow, returnThisMember, that} from "./abc";
 
 import * as abc from "./abc";
 
@@ -15,10 +15,14 @@ it("should have this = undefined on harmony modules", function() {
 	(function() {
 		abc.returnThisMember();
 	}).should.throw();
+	(function() {
+		extendThisClass();
+	}).should.throw();
 });
 
 it("should not break classes and functions", function() {
 	(new _C).foo().should.be.eql("bar");
+	(new _C).bar().should.be.eql("bar");
 	(new _D).prop().should.be.eql("ok");
 });
 

Original file line number	Diff line number	Diff line change
`@@ -609,9 +609,13 @@ class Parser extends Tapable {`
`609`	`609`	`if(classy.superClass)`
`610`	`610`	`this.walkExpression(classy.superClass);`
`611`	`611`	`if(classy.body && classy.body.type === "ClassBody") {`
`612`		`- for(const methodDefinition of classy.body.body)`
	`612`	`+ const wasTopLevel = this.scope.topLevelScope;`
	`613`	`+ this.scope.topLevelScope = false;`
	`614`	`+ for(const methodDefinition of classy.body.body) {`
`613`	`615`	`if(methodDefinition.type === "MethodDefinition")`
`614`	`616`	`this.walkMethodDefinition(methodDefinition);`
	`617`	`+ }`
	`618`	`+ this.scope.topLevelScope = wasTopLevel;`
`615`	`619`	`}`
`616`	`620`	`}`
`617`	`621`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,13 @@ export class C {`
`22`	`22`	`foo() {`
`23`	`23`	`return this.x;`
`24`	`24`	`}`
	`25`	`+ bar(x = this.x) {`
	`26`	`+ return x;`
	`27`	`+ }`
	`28`	`+}`
	`29`	`+`
	`30`	`+export const extendThisClass = () => {`
	`31`	`+ return class extends this.Buffer {};`
`25`	`32`	`}`
`26`	`33`
`27`	`34`	`export function D() {`