fix webpack#6688

sokra · sokra · commit 800e7f967bc5 · 2018-03-06T15:03:33.000+01:00
diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js
@@ -173,10 +173,10 @@ const getSymbolsFromScope = (s, untilScope) => {
 	const allUsedNames = new Set();
 	let scope = s;
 	while (scope) {
-		if (untilScope === scope) break;
 		for (const variable of scope.variables) {
 			allUsedNames.add(variable.name);
 		}
+		if (untilScope === scope) break;
 		scope = scope.upper;
 	}
 	return allUsedNames;
diff --git a/test/configCases/scope-hoisting/class-naming/index.js b/test/configCases/scope-hoisting/class-naming/index.js
@@ -0,0 +1,5 @@
+import { Hello as t } from "./module2";
+
+it("should rename classes correctly", () => {
+	new t();
+});
diff --git a/test/configCases/scope-hoisting/class-naming/module.js b/test/configCases/scope-hoisting/class-naming/module.js
@@ -0,0 +1 @@
+export class Hello {}
diff --git a/test/configCases/scope-hoisting/class-naming/module2.js b/test/configCases/scope-hoisting/class-naming/module2.js
@@ -0,0 +1,3 @@
+import * as MODULE from "./module";
+let Hello = class Hello extends MODULE.Hello {}
+export { Hello }
diff --git a/test/configCases/scope-hoisting/class-naming/webpack.config.js b/test/configCases/scope-hoisting/class-naming/webpack.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+	optimization: {
+		concatenateModules: true
+	}
+};

Original file line number	Diff line number	Diff line change
`@@ -173,10 +173,10 @@ const getSymbolsFromScope = (s, untilScope) => {`
`173`	`173`	`const allUsedNames = new Set();`
`174`	`174`	`let scope = s;`
`175`	`175`	`while (scope) {`
`176`		`- if (untilScope === scope) break;`
`177`	`176`	`for (const variable of scope.variables) {`
`178`	`177`	`allUsedNames.add(variable.name);`
`179`	`178`	`}`
	`179`	`+ if (untilScope === scope) break;`
`180`	`180`	`scope = scope.upper;`
`181`	`181`	`}`
`182`	`182`	`return allUsedNames;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import * as MODULE from "./module";`
	`2`	`+let Hello = class Hello extends MODULE.Hello {}`
	`3`	`+export { Hello }`