Refactor: Use more generator functions for fix (#750)

sindresorhus · May 27, 2020 · 16f6ef3 · 16f6ef3
1 parent 754fc47
commit 16f6ef3
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 75 deletions.
diff --git a/rules/custom-error-definition.js b/rules/custom-error-definition.js
@@ -122,25 +122,19 @@ const customErrorDefinition = (context, node) => {
 		context.report({
 			node: superExpression,
 			message: 'Pass the error message to `super()` instead of setting `this.message`.',
-			fix: fixer => {
-				const fixings = [];
+			* fix(fixer) {
 				if (superExpression.expression.arguments.length === 0) {
 					const rhs = expression.expression.right;
-					fixings.push(
-						fixer.insertTextAfterRange([
-							superExpression.range[0],
-							superExpression.range[0] + 6
-						], rhs.raw || rhs.name)
-					);
+					yield fixer.insertTextAfterRange([
+						superExpression.range[0],
+						superExpression.range[0] + 6
+					], rhs.raw || rhs.name);
 				}
 
-				fixings.push(
-					fixer.removeRange([
-						messageExpressionIndex === 0 ? constructorBodyNode.range[0] : constructorBody[messageExpressionIndex - 1].range[1],
-						expression.range[1]
-					])
-				);
-				return fixings;
+				yield fixer.removeRange([
+					messageExpressionIndex === 0 ? constructorBodyNode.range[0] : constructorBody[messageExpressionIndex - 1].range[1],
+					expression.range[1]
+				]);
 			}
 		});
 	}

diff --git a/rules/prefer-flat-map.js b/rules/prefer-flat-map.js
@@ -97,34 +97,30 @@ const reportFlatMap = (context, nodeFlat, nodeMap) => {
 	context.report({
 		node: nodeFlat,
 		messageId: MESSAGE_ID_FLATMAP,
-		fix: fixer => {
-			const fixings = [
-				// Removes:
-				//   map(…).flat();
-				//         ^^^^^^^
-				//   (map(…)).flat();
-				//           ^^^^^^^
-				fixer.removeRange([fixStart, fixEnd]),
-
-				// Renames:
-				//   map(…).flat();
-				//   ^^^
-				//   (map(…)).flat();
-				//    ^^^
-				fixer.replaceText(mapProperty, 'flatMap')
-			];
+		* fix(fixer) {
+			// Removes:
+			//   map(…).flat();
+			//         ^^^^^^^
+			//   (map(…)).flat();
+			//           ^^^^^^^
+			yield fixer.removeRange([fixStart, fixEnd]);
+
+			// Renames:
+			//   map(…).flat();
+			//   ^^^
+			//   (map(…)).flat();
+			//    ^^^
+			yield fixer.replaceText(mapProperty, 'flatMap');
 
 			if (hasSemicolon) {
 				// Moves semicolon to:
 				//   map(…).flat();
 				//         ^
 				//   (map(…)).flat();
 				//           ^
-				fixings.push(fixer.insertTextAfter(beforeSemicolon, ';'));
-				fixings.push(fixer.remove(maybeSemicolon));
+				yield fixer.insertTextAfter(beforeSemicolon, ';');
+				yield fixer.remove(maybeSemicolon);
 			}
-
-			return fixings;
 		}
 	});
 };

diff --git a/rules/prefer-negative-index.js b/rules/prefer-negative-index.js
@@ -288,13 +288,13 @@ const create = context => ({
 		context.report({
 			node,
 			message: `Prefer negative index over length minus index for \`${method}\`.`,
-			fix(fixer) {
+			* fix(fixer) {
 				const sourceCode = context.getSourceCode();
-				return removableNodes.map(
-					node => fixer.removeRange(
+				for (const node of removableNodes) {
+					yield fixer.removeRange(
 						getRemovalRange(node, sourceCode)
-					)
-				);
+					);
+				}
 			}
 		});
 	}

diff --git a/rules/prefer-query-selector.js b/rules/prefer-query-selector.js
@@ -16,7 +16,7 @@ const getQuotedReplacement = (node, value) => {
 	return `${leftQuote}${value}${rightQuote}`;
 };
 
-const getLiteralFix = (fixer, node, identifierName) => {
+function * getLiteralFix(fixer, node, identifierName) {
 	let replacement = node.raw;
 	if (identifierName === 'getElementById') {
 		replacement = getQuotedReplacement(node, getReplacementForId(node.value));
@@ -26,37 +26,29 @@ const getLiteralFix = (fixer, node, identifierName) => {
 		replacement = getQuotedReplacement(node, getReplacementForClass(node.value));
 	}
 
-	return [fixer.replaceText(node, replacement)];
-};
+	yield fixer.replaceText(node, replacement);
+}
 
-const getTemplateLiteralFix = (fixer, node, identifierName) => {
-	const fix = [
-		fixer.insertTextAfter(node, '`'),
-		fixer.insertTextBefore(node, '`')
-	];
+function * getTemplateLiteralFix(fixer, node, identifierName) {
+	yield fixer.insertTextAfter(node, '`');
+	yield fixer.insertTextBefore(node, '`');
 
-	node.quasis.forEach(templateElement => {
+	for (const templateElement of node.quasis) {
 		if (identifierName === 'getElementById') {
-			fix.push(
-				fixer.replaceText(
-					templateElement,
-					getReplacementForId(templateElement.value.cooked)
-				)
+			yield fixer.replaceText(
+				templateElement,
+				getReplacementForId(templateElement.value.cooked)
 			);
 		}
 
 		if (identifierName === 'getElementsByClassName') {
-			fix.push(
-				fixer.replaceText(
-					templateElement,
-					getReplacementForClass(templateElement.value.cooked)
-				)
+			yield fixer.replaceText(
+				templateElement,
+				getReplacementForClass(templateElement.value.cooked)
 			);
 		}
-	});
-
-	return fix;
-};
+	}
+}
 
 const canBeFixed = node => {
 	if (node.type === 'Literal') {
@@ -88,10 +80,10 @@ const fix = (node, identifierName, preferedSelector) => {
 	}
 
 	const getArgumentFix = nodeToBeFixed.type === 'Literal' ? getLiteralFix : getTemplateLiteralFix;
-	return fixer => [
-		...getArgumentFix(fixer, nodeToBeFixed, identifierName),
-		fixer.replaceText(node.callee.property, preferedSelector)
-	];
+	return function * (fixer) {
+		yield * getArgumentFix(fixer, nodeToBeFixed, identifierName);
+		yield fixer.replaceText(node.callee.property, preferedSelector);
+	};
 };
 
 const create = context => {

diff --git a/rules/prefer-set-has.js b/rules/prefer-set-has.js
@@ -163,11 +163,14 @@ const create = context => {
 				data: {
 					name: node.name
 				},
-				fix: fixer => [
-					fixer.insertTextBefore(node.parent.init, 'new Set('),
-					fixer.insertTextAfter(node.parent.init, ')'),
-					...identifiers.map(identifier => fixer.replaceText(identifier.parent.property, 'has'))
-				]
+				* fix(fixer) {
+					yield fixer.insertTextBefore(node.parent.init, 'new Set(');
+					yield fixer.insertTextAfter(node.parent.init, ')');
+
+					for (const identifier of identifiers) {
+						yield fixer.replaceText(identifier.parent.property, 'has');
+					}
+				}
 			});
 		}
 	};

diff --git a/rules/prevent-abbreviations.js b/rules/prevent-abbreviations.js
@@ -625,9 +625,10 @@ const create = context => {
 				generatedNames.add(replacement);
 			}
 
-			problem.fix = fixer => {
-				return getVariableIdentifiers(variable)
-					.map(identifier => renameIdentifier(identifier, replacement, fixer, sourceCode));
+			problem.fix = function * (fixer) {
+				for (const identifier of getVariableIdentifiers(variable)) {
+					yield renameIdentifier(identifier, replacement, fixer, sourceCode);
+				}
 			};
 		}