fixed renaming in IIFEs and Assignments

sokra · sokra · commit 41e42e85895f · 2014-10-26T11:17:47.000+01:00
fixed webpack#551, fixed webpack#494
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -562,11 +562,13 @@ Parser.prototype.walkLogicalExpression = function walkLeftRightExpression(expres
 
 Parser.prototype.walkAssignmentExpression = function walkAssignmentExpression(expression) {
 	var renameIdentifier = this.getRenameIdentifier(expression.right);
-	if(expression.left.type === "Identifier" && renameIdentifier && !this.applyPluginsBailResult("rename " + renameIdentifier, expression.right)) {
+	if(expression.left.type === "Identifier" && renameIdentifier && this.applyPluginsBailResult("can-rename " + renameIdentifier, expression.right)) {
 		// renaming "a = b;"
-		this.scope.renames["$"+expression.left.name] = renameIdentifier;
-		var idx = this.scope.definitions.indexOf(expression.left.name);
-		if(idx >= 0) this.scope.definitions.splice(idx, 1);
+		if(!this.applyPluginsBailResult("rename " + renameIdentifier, expression.right)) {
+			this.scope.renames["$"+expression.left.name] = renameIdentifier;
+			var idx = this.scope.definitions.indexOf(expression.left.name);
+			if(idx >= 0) this.scope.definitions.splice(idx, 1);
+		}
 	} else if(expression.left.type === "Identifier") {
 		if(!this.applyPluginsBailResult("assigned " + expression.left.name, expression)) {
 			this.walkExpression(expression.right);
@@ -608,13 +610,11 @@ Parser.prototype.walkCallExpression = function walkCallExpression(expression) {
 		var params = functionExpression.params;
 		var args = args.map(function(arg, idx) {
 			var renameIdentifier = this.getRenameIdentifier(arg);
-			if(!renameIdentifier) {
-				this.walkExpression(arg);
-				return;
-			} else if(this.applyPluginsBailResult("rename " + renameIdentifier, arg)) {
-				return;
+			if(renameIdentifier && this.applyPluginsBailResult("can-rename " + renameIdentifier, arg)) {
+				if(!this.applyPluginsBailResult("rename " + renameIdentifier, arg))
+					return renameIdentifier;
 			}
-			return renameIdentifier;
+			this.walkExpression(arg);
 		}, this);
 		this.inScope(params.filter(function(identifier, idx) {
 			return !args[idx];
diff --git a/test/cases/parsing/issue-494/index.js b/test/cases/parsing/issue-494/index.js
@@ -0,0 +1,5 @@
+it("should replace a free var in a IIFE", function() {
+	(function(md) {
+		md.should.be.type("function");
+	}(module.deprecate));
+});
diff --git a/test/cases/parsing/issue-551/index.js b/test/cases/parsing/issue-551/index.js
@@ -1,16 +1,20 @@
 var window = {};
 
 it("should be able to set the public path", function() {
+	global.xyz = "xyz";
+	__webpack_public_path__ = global.xyz;
+	__webpack_require__.p.should.be.eql("xyz");
+
 	window.something = "something";
 	__webpack_public_path__ = window.something;
-	__webpack_public_path__.should.be.eql("something");
-	
+	__webpack_require__.p.should.be.eql("something");
+
 	__webpack_public_path__ = "abc";
-	__webpack_public_path__.should.be.eql("abc");
-	
+	__webpack_require__.p.should.be.eql("abc");
+
 	__webpack_public_path__ = func();
-	__webpack_public_path__.should.be.eql("func");
-	
+	__webpack_require__.p.should.be.eql("func");
+
 	function func() {
 		return "func";
 	}
