Fix ASI problem

sindresorhus · Jan 13, 2021 · 038279e · 038279e
1 parent 87911db
commit 038279e
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/rules/no-array-push-push.js b/rules/no-array-push-push.js
@@ -1,5 +1,5 @@
 'use strict';
-const {hasSideEffect, isCommaToken, isOpeningParenToken} = require('eslint-utils');
+const {hasSideEffect, isCommaToken, isOpeningParenToken, isSemicolonToken} = require('eslint-utils');
 const getDocumentationUrl = require('./utils/get-documentation-url');
 const methodSelector = require('./utils/method-selector');
 
@@ -83,9 +83,12 @@ function create(context) {
 					));
 				}
 
+				const shouldKeepSemicolon = !isSemicolonToken(sourceCode.getLastToken(firstExpression)) &&
+					isSemicolonToken(sourceCode.getLastToken(secondExpression));
+
 				yield fixer.replaceTextRange(
 					[firstExpression.range[1], secondExpression.range[1]],
-					''
+					shouldKeepSemicolon ? ';' : ''
 				);
 			};
 

diff --git a/test/no-array-push-push.js b/test/no-array-push-push.js
@@ -136,6 +136,12 @@ test.visualize({
 				foo.push(1);
 				foo.push(2);
 			}
+		`,
+		// ASI
+		outdent`
+			foo.push(1)
+			foo.push(2)
+			;[foo].forEach(bar)
 		`
 	]
 });
diff --git a/test/snapshots/no-array-push-push.js.md b/test/snapshots/no-array-push-push.js.md
@@ -389,3 +389,23 @@ Generated by [AVA](https://avajs.dev).
         | 	    ^^^^ Do not call `Array#push()` multiple times.␊
       4 | }␊
     `
+
+## Invalid #21
+      1 | foo.push(1)
+      2 | foo.push(2)
+      3 | ;[foo].forEach(bar)
+
+> Output
+
+    `␊
+      1 | foo.push(1, 2);[foo].forEach(bar)␊
+    `
+
+> Error 1/1
+
+    `␊
+      1 | foo.push(1)␊
+    > 2 | foo.push(2)␊
+        |     ^^^^ Do not call `Array#push()` multiple times.␊
+      3 | ;[foo].forEach(bar)␊
+    `
diff --git a/test/snapshots/no-array-push-push.js.snap b/test/snapshots/no-array-push-push.js.snap