Merge branch 'master' into next

sokra · sokra · commit 85951d33beff · 2017-12-05T09:03:45.000+01:00
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -103,6 +103,7 @@ class Parser extends Tapable {
 			importCall: new SyncBailHook(["expression"]),
 			call: new HookMap(() => new SyncBailHook(["expression"])),
 			callAnyMember: new HookMap(() => new SyncBailHook(["expression"])),
+			new: new HookMap(() => new SyncBailHook(["expression"])),
 			expression: new HookMap(() => new SyncBailHook(["expression"])),
 			expressionAnyMember: new HookMap(() => new SyncBailHook(["expression"])),
 			program: new SyncBailHook(["ast", "comments"]),
@@ -126,6 +127,7 @@ class Parser extends Tapable {
 			expressionConditionalOperator: /^expression \?:$/,
 			callAnyMember: /^call (.+)\.\*$/,
 			call: /^call (.+)$/,
+			new: /^new (.+)$/,
 			expressionAnyMember: /^expression (.+)\.\*$/,
 			expression: /^expression (.+)$/,
 		};
@@ -1200,6 +1202,17 @@ class Parser extends Tapable {
 	}
 
 	walkNewExpression(expression) {
+		const callee = this.evaluateExpression(expression.callee);
+		if(callee.isIdentifier()) {
+			const hook = this.hooks.new.for(callee.identifier);
+			if(hook !== undefined) {
+				const result = hook.call(expression);
+				if(result === true) {
+					return;
+				}
+			}
+		}
+
 		this.walkExpression(expression.callee);
 		if(expression.arguments)
 			this.walkExpressions(expression.arguments);
diff --git a/test/Parser.unittest.js b/test/Parser.unittest.js
@@ -194,6 +194,13 @@ describe("Parser", () => {
 				ijksub: ["test"]
 			}
 		],
+		"new Foo(...)": [
+			function() {
+				new xyz("membertest");
+			}, {
+				xyz: ["membertest"]
+			}
+		],
 	};
 	/* eslint-enable no-undef */
 	/* eslint-enable no-unused-vars */
@@ -243,6 +250,11 @@ describe("Parser", () => {
 				testParser.state.expressions.push(expr.name);
 				return true;
 			});
+			testParser.plugin("new xyz", (expr) => {
+				if(!testParser.state.xyz) testParser.state.xyz = [];
+				testParser.state.xyz.push(testParser.parseString(expr.arguments[0]));
+				return true;
+			});
 			const actual = testParser.parse(source);
 			should.strictEqual(typeof actual, "object");
 			actual.should.be.eql(state);
