Merge pull request #1498 from lukastaegert/master

Correctly handle variables introduced in switch scopes

src/ast/nodes/SwitchStatement.js

@@ -0,0 +1,14 @@
+import Scope from '../scopes/Scope.js';
+import Statement from './shared/Statement.js';
+
+export default class SwitchStatement extends Statement {
+	initialise ( scope ) {
+		this.scope = new Scope( {
+			parent: scope,
+			isBlockScope: true,
+			isLexicalBoundary: false
+		} );
+
+		super.initialise( this.scope );
+	}
+}

src/ast/nodes/index.js

@@ -28,6 +28,7 @@ import NewExpression from './NewExpression.js';
 import ObjectExpression from './ObjectExpression.js';
 import ReturnStatement from './ReturnStatement.js';
 import Statement from './shared/Statement.js';
+import SwitchStatement from './SwitchStatement.js';
 import TemplateLiteral from './TemplateLiteral.js';
 import ThisExpression from './ThisExpression.js';
 import ThrowStatement from './ThrowStatement.js';
@@ -67,7 +68,7 @@ export default {
 	NewExpression,
 	ObjectExpression,
 	ReturnStatement,
-	SwitchStatement: Statement,
+	SwitchStatement,
 	TemplateLiteral,
 	ThisExpression,
 	ThrowStatement,

test/form/switch-scopes/_config.js

@@ -0,0 +1,6 @@
+module.exports = {
+	description: 'correctly handles switch scopes',
+  options: {
+    moduleName: 'myBundle'
+  }
+};

test/form/switch-scopes/_expected/amd.js

@@ -0,0 +1,13 @@
+define(function () { 'use strict';
+
+	const x = globalFunction;
+	switch ( anotherGlobal ) {
+		case 2:
+			x();
+	}
+
+	switch ( globalFunction() ) {
+		case 4:
+	}
+
+});

test/form/switch-scopes/_expected/cjs.js

@@ -0,0 +1,11 @@
+'use strict';
+
+const x = globalFunction;
+switch ( anotherGlobal ) {
+	case 2:
+		x();
+}
+
+switch ( globalFunction() ) {
+	case 4:
+}

test/form/switch-scopes/_expected/es.js

@@ -0,0 +1,9 @@
+const x = globalFunction;
+switch ( anotherGlobal ) {
+	case 2:
+		x();
+}
+
+switch ( globalFunction() ) {
+	case 4:
+}

test/form/switch-scopes/_expected/iife.js

@@ -0,0 +1,14 @@
+(function () {
+	'use strict';
+
+	const x = globalFunction;
+	switch ( anotherGlobal ) {
+		case 2:
+			x();
+	}
+
+	switch ( globalFunction() ) {
+		case 4:
+	}
+
+}());

test/form/switch-scopes/_expected/umd.js

@@ -0,0 +1,17 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(factory());
+}(this, (function () { 'use strict';
+
+	const x = globalFunction;
+	switch ( anotherGlobal ) {
+		case 2:
+			x();
+	}
+
+	switch ( globalFunction() ) {
+		case 4:
+	}
+
+})));

test/form/switch-scopes/main.js

@@ -0,0 +1,23 @@
+const x = globalFunction;
+function y () {}
+
+switch ( anotherGlobal ) {
+	case 1:
+		const x = function () {};
+		x();
+}
+
+switch ( anotherGlobal ) {
+	case 2:
+		x();
+}
+
+switch ( anotherGlobal ) {
+	case 3:
+		const y = globalFunction;
+}
+y();
+
+switch ( globalFunction() ) {
+	case 4:
+}