Merge pull request webpack#6288 from ooflorent/fix_variable_hook

sokra · web-flow · commit 416247102abb · 2018-01-12T10:58:03.000+01:00
Fix VariableDeclaration visitors
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -1064,63 +1064,17 @@ class Parser extends Tapable {
 	}
 
 	prewalkVariableDeclaration(statement) {
-		if(statement.declarations)
-			this.prewalkVariableDeclarators(statement.declarations);
-	}
-
-	walkVariableDeclaration(statement) {
-		if(statement.declarations)
-			this.walkVariableDeclarators(statement.declarations);
-	}
-
-	prewalkClassDeclaration(statement) {
-		if(statement.id) {
-			this.scope.renames.set(statement.id.name, null);
-			this.scope.definitions.add(statement.id.name);
-		}
-	}
-
-	walkClassDeclaration(statement) {
-		this.walkClass(statement);
-	}
-
-	prewalkSwitchCases(switchCases) {
-		for(let index = 0, len = switchCases.length; index < len; index++) {
-			const switchCase = switchCases[index];
-			this.prewalkStatements(switchCase.consequent);
-		}
-	}
-
-	walkSwitchCases(switchCases) {
-		for(let index = 0, len = switchCases.length; index < len; index++) {
-			const switchCase = switchCases[index];
-
-			if(switchCase.test) {
-				this.walkExpression(switchCase.test);
-			}
-			this.walkStatements(switchCase.consequent);
-		}
-	}
-
-	walkCatchClause(catchClause) {
-		this.inScope([catchClause.param], () => {
-			this.prewalkStatement(catchClause.body);
-			this.walkStatement(catchClause.body);
-		});
-	}
-
-	prewalkVariableDeclarators(declarators) {
-		for(const declarator of declarators) {
+		const hookMap = statement.kind === "const" ? this.hooks.varDeclarationConst :
+			statement.kind === "let" ? this.hooks.varDeclarationLet :
+			this.hooks.varDeclarationVar;
+		for(const declarator of statement.declarations) {
 			switch(declarator.type) {
 				case "VariableDeclarator":
 					{
 						this.enterPattern(declarator.id, (name, decl) => {
-							const hookMap = declarator.kind === "const" ? this.hooks.varDeclarationConst :
-								declarator.kind === "let" ? this.hooks.varDeclarationLet :
-								this.hooks.varDeclarationVar;
-							const hook = hookMap.get(name);
+							let hook = hookMap.get(name);
 							if(hook === undefined || !hook.call(decl)) {
-								const hook = this.hooks.varDeclaration.get(name);
+								hook = this.hooks.varDeclaration.get(name);
 								if(hook === undefined || !hook.call(decl)) {
 									this.scope.renames.set(name, null);
 									this.scope.definitions.add(name);
@@ -1133,8 +1087,8 @@ class Parser extends Tapable {
 		}
 	}
 
-	walkVariableDeclarators(declarators) {
-		for(const declarator of declarators) {
+	walkVariableDeclaration(statement) {
+		for(const declarator of statement.declarations) {
 			switch(declarator.type) {
 				case "VariableDeclarator":
 					{
@@ -1160,6 +1114,42 @@ class Parser extends Tapable {
 		}
 	}
 
+	prewalkClassDeclaration(statement) {
+		if(statement.id) {
+			this.scope.renames.set(statement.id.name, null);
+			this.scope.definitions.add(statement.id.name);
+		}
+	}
+
+	walkClassDeclaration(statement) {
+		this.walkClass(statement);
+	}
+
+	prewalkSwitchCases(switchCases) {
+		for(let index = 0, len = switchCases.length; index < len; index++) {
+			const switchCase = switchCases[index];
+			this.prewalkStatements(switchCase.consequent);
+		}
+	}
+
+	walkSwitchCases(switchCases) {
+		for(let index = 0, len = switchCases.length; index < len; index++) {
+			const switchCase = switchCases[index];
+
+			if(switchCase.test) {
+				this.walkExpression(switchCase.test);
+			}
+			this.walkStatements(switchCase.consequent);
+		}
+	}
+
+	walkCatchClause(catchClause) {
+		this.inScope([catchClause.param], () => {
+			this.prewalkStatement(catchClause.body);
+			this.walkStatement(catchClause.body);
+		});
+	}
+
 	walkPattern(pattern) {
 		switch(pattern.type) {
 			case "ArrayPattern":
