walk expression in require.ensure if not a fn expr

sokra · sokra · commit bd56e8385f3f · 2013-11-05T18:55:10.000+01:00
diff --git a/lib/dependencies/RequireEnsureDependenciesBlockParserPlugin.js b/lib/dependencies/RequireEnsureDependenciesBlockParserPlugin.js
@@ -63,6 +63,9 @@ module.exports = AbstractPlugin.create({
 			} finally {
 				this.state.current = old;
 			}
+			if(fnExpression.type !== "FunctionExpression") {
+				this.walkExpression(fnExpression);
+			}
 			return true;
 		}
 	}
diff --git a/test/browsertest/lib/index.web.js b/test/browsertest/lib/index.web.js
@@ -291,6 +291,15 @@ describe("main", function() {
 			require.ensure([], f);
 		});
 
+		it("should parse expression in require.ensure, which isn't a function expression", function(done) {
+			require.ensure([], (function() {
+				require("./empty?require.ensure:test").should.be.eql({});
+				return function f() {
+					done();
+				}
+			}()));
+		});
+
 		it("should accept a require.include call", function() {
 			require.include("./require.include");
 			var value = null;

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,9 @@ module.exports = AbstractPlugin.create({`
`63`	`63`	`} finally {`
`64`	`64`	`this.state.current = old;`
`65`	`65`	`}`
	`66`	`+ if(fnExpression.type !== "FunctionExpression") {`
	`67`	`+ this.walkExpression(fnExpression);`
	`68`	`+ }`
`66`	`69`	`return true;`
`67`	`70`	`}`
`68`	`71`	`}`