feat(no-wait-for-multiple-assertions): improve autofix (#1091)

Fixes #1081

Author: y-hsgw

lib/rules/no-wait-for-side-effects.ts

@@ -42,6 +42,8 @@ export default createTestingLibraryRule<Options, MessageIds>({
 	},
 	defaultOptions: [],
 	create(context, _, helpers) {
+		const sourceCode = getSourceCode(context);
+
 		function isCallerWaitFor(
 			node:
 				| TSESTree.AssignmentExpression
@@ -155,8 +157,6 @@ export default createTestingLibraryRule<Options, MessageIds>({
 				}
 				return false;
 			});
-
-			return false;
 		}
 
 		function getSideEffectNodes(
@@ -195,7 +195,17 @@ export default createTestingLibraryRule<Options, MessageIds>({
 			}) as TSESTree.ExpressionStatement[];
 		}
 
-		function reportSideEffects(node: TSESTree.BlockStatement) {
+		function reportSideEffects(
+			node: TSESTree.BlockStatement & {
+				parent: (
+					| TSESTree.ArrowFunctionExpression
+					| TSESTree.FunctionDeclaration
+					| TSESTree.FunctionExpression
+				) & {
+					parent: TSESTree.CallExpression;
+				};
+			}
+		) {
 			if (!isCallerWaitFor(node)) {
 				return;
 			}
@@ -204,10 +214,58 @@ export default createTestingLibraryRule<Options, MessageIds>({
 				return;
 			}
 
-			getSideEffectNodes(node.body).forEach((sideEffectNode) =>
+			const sideEffects = getSideEffectNodes(node.body);
+			sideEffects.forEach((sideEffectNode) =>
 				context.report({
 					node: sideEffectNode,
 					messageId: 'noSideEffectsWaitFor',
+					fix(fixer) {
+						const { parent: callExpressionNode } = node.parent;
+						const targetNode = isAwaitExpression(callExpressionNode.parent)
+							? callExpressionNode.parent
+							: callExpressionNode;
+
+						const lines = sourceCode.getText().split('\n');
+						const line = lines[targetNode.loc.start.line - 1];
+						const indent = line.match(/^\s*/)?.[0] ?? '';
+						const sideEffectLines = lines.slice(
+							sideEffectNode.loc.start.line - 1,
+							sideEffectNode.loc.end.line
+						);
+						const sideEffectNodeText = sideEffectLines.join('\n').trimStart();
+						if (
+							sideEffects.length === node.body.length &&
+							sideEffects.length === 1
+						) {
+							const tokenAfter = sourceCode.getTokenAfter(targetNode);
+							return [
+								fixer.insertTextBefore(targetNode, sideEffectNodeText),
+								tokenAfter?.value === ';'
+									? fixer.removeRange([
+											targetNode.range[0],
+											tokenAfter.range[1],
+										])
+									: fixer.remove(targetNode),
+							];
+						}
+
+						const lineStart = sourceCode.getIndexFromLoc({
+							line: sideEffectNode.loc.start.line,
+							column: 0,
+						});
+						const lineEnd = sourceCode.getIndexFromLoc({
+							line: sideEffectNode.loc.end.line + 1,
+							column: 0,
+						});
+
+						return [
+							fixer.insertTextBefore(
+								targetNode,
+								sideEffectNodeText + '\n' + indent
+							),
+							fixer.removeRange([lineStart, lineEnd]),
+						];
+					},
 				})
 			);
 		}
@@ -260,7 +318,7 @@ export default createTestingLibraryRule<Options, MessageIds>({
 					const targetNode = isAwaitExpression(callExpressionNode.parent)
 						? callExpressionNode.parent
 						: callExpressionNode;
-					const sourceCode = getSourceCode(context);
+
 					return fixer.replaceText(targetNode, sourceCode.getText(node));
 				},
 			});