Extract switchNewExpressionToCallExpression

Author: fisker

rules/new-for-builtins.js

@@ -2,7 +2,7 @@
 const getDocumentationUrl = require('./utils/get-documentation-url');
 const builtins = require('./utils/builtins');
 const isShadowed = require('./utils/is-shadowed');
-const isNewExpressionWithParentheses = require('./utils/is-new-expression-with-parentheses');
+const switchNewExpressionToCallExpression = require('./utils/switch-new-expression-to-call-expression');
 
 const messages = {
 	enforce: 'Use `new {{name}}()` instead of `{{name}}()`.',
@@ -40,7 +40,7 @@ const create = context => {
 			}
 		},
 		NewExpression: node => {
-			const {callee, range} = node;
+			const {callee} = node;
 			const {name} = callee;
 
 			if (disallowNew.has(name) && !isShadowed(context.getScope(), callee)) {
@@ -52,17 +52,7 @@ const create = context => {
 
 				if (name !== 'String' && name !== 'Boolean' && name !== 'Number') {
 					problem.fix = function * (fixer) {
-						const [start] = range;
-						let end = start + 3; // `3` = length of `new`
-						const textAfter = sourceCode.text.slice(end);
-						const [leadingSpaces] = textAfter.match(/^\s*/);
-						end += leadingSpaces.length;
-
-						yield fixer.removeRange([start, end]);
-
-						if (!isNewExpressionWithParentheses(node, sourceCode)) {
-							yield fixer.insertTextAfter(node, '()');
-						}
+						yield * switchNewExpressionToCallExpression(node, sourceCode, fixer);
 					};
 				}
 

rules/no-new-buffer.js

@@ -1,7 +1,7 @@
 'use strict';
 const {getStaticValue} = require('eslint-utils');
 const getDocumentationUrl = require('./utils/get-documentation-url');
-const isNewExpressionWithParentheses = require('./utils/is-new-expression-with-parentheses');
+const switchNewExpressionToCallExpression = require('./utils/switch-new-expression-to-call-expression');
 
 const ERROR = 'error';
 const ERROR_UNKNOWN = 'error-unknown';
@@ -44,18 +44,8 @@ const inferMethod = (bufferArguments, scope) => {
 
 function fix(node, sourceCode, method) {
 	return function * (fixer) {
-		const [start] = node.range;
-		let end = start + 3; // `3` = length of `new`
-		const textAfter = sourceCode.text.slice(end);
-		const [leadingSpaces] = textAfter.match(/^\s*/);
-		end += leadingSpaces.length;
-		yield fixer.removeRange([start, end]);
-
+		yield * switchNewExpressionToCallExpression(node, sourceCode, fixer);
 		yield fixer.insertTextAfter(node.callee, `.${method}`);
-
-		if (!isNewExpressionWithParentheses(node, sourceCode)) {
-			yield fixer.insertTextAfter(node, '()');
-		}
 	};
 }
 

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

@@ -0,0 +1,17 @@
+'use strict';
+const isNewExpressionWithParentheses = require('./is-new-expression-with-parentheses');
+
+function * switchNewExpressionToCallExpression(node, sourceCode, fixer) {
+	const [start] = node.range;
+	let end = start + 3; // `3` = length of `new`
+	const textAfter = sourceCode.text.slice(end);
+	const [leadingSpaces] = textAfter.match(/^\s*/);
+	end += leadingSpaces.length;
+	yield fixer.removeRange([start, end]);
+
+	if (!isNewExpressionWithParentheses(node, sourceCode)) {
+		yield fixer.insertTextAfter(node, '()');
+	}
+}
+
+module.exports = switchNewExpressionToCallExpression