Add switchCallExpressionToNewExpression (#1435)

Author: fisker

rules/fix/index.js

@@ -7,6 +7,7 @@ module.exports = {
 	appendArgument: require('./append-argument.js'),
 	removeArgument: require('./remove-argument.js'),
 	switchNewExpressionToCallExpression: require('./switch-new-expression-to-call-expression.js'),
+	switchCallExpressionToNewExpression: require('./switch-call-expression-to-new-expression.js'),
 	removeMemberExpressionProperty: require('./remove-member-expression-property.js'),
 	removeMethodCall: require('./remove-method-call.js'),
 	replaceTemplateElement: require('./replace-template-element.js'),

rules/fix/switch-call-expression-to-new-expression.js

@@ -0,0 +1,18 @@
+'use strict';
+const {isParenthesized} = require('../utils/parentheses.js');
+const shouldAddParenthesesToNewExpressionCallee = require('../utils/should-add-parentheses-to-new-expression-callee.js');
+
+function * switchCallExpressionToNewExpression(node, sourceCode, fixer) {
+	yield fixer.insertTextBefore(node, 'new ');
+
+	const {callee} = node;
+	if (
+		!isParenthesized(callee, sourceCode) &&
+		shouldAddParenthesesToNewExpressionCallee(callee)
+	) {
+		yield fixer.insertTextBefore(callee, '(');
+		yield fixer.insertTextAfter(callee, ')');
+	}
+}
+
+module.exports = switchCallExpressionToNewExpression;

rules/new-for-builtins.js

@@ -2,7 +2,10 @@
 const builtins = require('./utils/builtins.js');
 const isShadowed = require('./utils/is-shadowed.js');
 const {callExpressionSelector, newExpressionSelector} = require('./selectors/index.js');
-const {switchNewExpressionToCallExpression} = require('./fix/index.js');
+const {
+	switchCallExpressionToNewExpression,
+	switchNewExpressionToCallExpression,
+} = require('./fix/index.js');
 
 const messages = {
 	enforce: 'Use `new {{name}}()` instead of `{{name}}()`.',
@@ -35,7 +38,7 @@ const create = context => {
 				node,
 				messageId: 'enforce',
 				data: {name},
-				fix: fixer => fixer.insertTextBefore(node, 'new '),
+				fix: fixer => switchCallExpressionToNewExpression(node, sourceCode, fixer),
 			};
 		},
 		[newExpressionSelector(builtins.disallowNew)]: node => {

rules/throw-new-error.js

@@ -1,7 +1,6 @@
 'use strict';
 const {matches} = require('./selectors/index.js');
-const {getParenthesizedRange, isParenthesized} = require('./utils/parentheses.js');
-const shouldAddParenthesesToNewExpressionCallee = require('./utils/should-add-parentheses-to-new-expression-callee.js');
+const {switchCallExpressionToNewExpression} = require('./fix/index.js');
 
 const messageId = 'throw-new-error';
 const messages = {
@@ -31,26 +30,11 @@ const selector = [
 ].join('');
 
 const create = context => ({
-	[selector]: node => {
-		return {
-			node,
-			messageId,
-			* fix(fixer) {
-				const errorConstructor = node.callee;
-				const sourceCode = context.getSourceCode();
-				const range = getParenthesizedRange(errorConstructor, sourceCode);
-				yield fixer.insertTextBeforeRange(range, 'new ');
-
-				if (
-					!isParenthesized(errorConstructor, sourceCode) &&
-					shouldAddParenthesesToNewExpressionCallee(errorConstructor)
-				) {
-					yield fixer.insertTextBeforeRange(range, '(');
-					yield fixer.insertTextAfterRange(range, ')');
-				}
-			},
-		};
-	},
+	[selector]: node => ({
+		node,
+		messageId,
+		fix: fixer => switchCallExpressionToNewExpression(node, context.getSourceCode(), fixer),
+	}),
 });
 
 module.exports = {

test/new-for-builtins.mjs

@@ -194,9 +194,9 @@ test({
 			output: 'const foo = new Int32Array()',
 		},
 		{
-			code: 'const foo = Map()',
+			code: 'const foo = (( Map ))()',
 			errors: [enforceNewError('Map')],
-			output: 'const foo = new Map()',
+			output: 'const foo = new (( Map ))()',
 		},
 		{
 			code: 'const foo = Map([[\'foo\', \'bar\'], [\'unicorn\', \'rainbow\']])',