Update: indentation of comment followed by semicolon (fixes #12232)

eslint · Sep 9, 2019 · 0192f74 · 0192f74
1 parent 460c5ad
commit 0192f74
Show file tree

Hide file tree

Showing 2 changed files with 510 additions and 6 deletions.
diff --git a/lib/rules/indent.js b/lib/rules/indent.js
@@ -1588,15 +1588,9 @@ module.exports = {
                             return;
                         }
 
-                        // If the token matches the expected expected indentation, don't report it.
-                        if (validateTokenIndent(firstTokenOfLine, offsets.getDesiredIndent(firstTokenOfLine))) {
-                            return;
-                        }
-
                         if (astUtils.isCommentToken(firstTokenOfLine)) {
                             const tokenBefore = precedingTokens.get(firstTokenOfLine);
                             const tokenAfter = tokenBefore ? sourceCode.getTokenAfter(tokenBefore) : sourceCode.ast.tokens[0];
-
                             const mayAlignWithBefore = tokenBefore && !hasBlankLinesBetween(tokenBefore, firstTokenOfLine);
                             const mayAlignWithAfter = tokenAfter && !hasBlankLinesBetween(firstTokenOfLine, tokenAfter);
 
@@ -1607,6 +1601,26 @@ module.exports = {
                             ) {
                                 return;
                             }
+
+                            /*
+                             * If a comment precedes a line that begins with a semicolon token, align to that token, i.e.
+                             *
+                             * let foo
+                             * // comment
+                             * ;(async () => {})()
+                             */
+                            if (tokenAfter && astUtils.isSemicolonToken(tokenAfter) && !astUtils.isTokenOnSameLine(firstTokenOfLine, tokenAfter)) {
+                                offsets.setDesiredOffset(firstTokenOfLine, tokenAfter, 0);
+
+                                if (validateTokenIndent(firstTokenOfLine, offsets.getDesiredIndent(tokenAfter))) {
+                                    return;
+                                }
+                            }
+                        }
+
+                        // If the token matches the expected indentation, don't report it.
+                        if (validateTokenIndent(firstTokenOfLine, offsets.getDesiredIndent(firstTokenOfLine))) {
+                            return;
                         }
 
                         // Otherwise, report the token/comment.