From f92352e43f1e0f888a8e7b7116d03cf3b978d894 Mon Sep 17 00:00:00 2001 From: Kai Cataldo Date: Thu, 12 Sep 2019 14:54:03 -0400 Subject: [PATCH] Refactor --- lib/rules/indent.js | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/lib/rules/indent.js b/lib/rules/indent.js index 76bde3a1d860..f44eafa715cf 100644 --- a/lib/rules/indent.js +++ b/lib/rules/indent.js @@ -1594,14 +1594,6 @@ module.exports = { const mayAlignWithBefore = tokenBefore && !hasBlankLinesBetween(tokenBefore, firstTokenOfLine); const mayAlignWithAfter = tokenAfter && !hasBlankLinesBetween(firstTokenOfLine, tokenAfter); - // If a comment matches the expected indentation of the token immediately before or after, don't report it. - if ( - mayAlignWithBefore && validateTokenIndent(firstTokenOfLine, offsets.getDesiredIndent(tokenBefore)) || - mayAlignWithAfter && validateTokenIndent(firstTokenOfLine, offsets.getDesiredIndent(tokenAfter)) - ) { - return; - } - /* * If a comment precedes a line that begins with a semicolon token, align to that token, i.e. * @@ -1611,10 +1603,14 @@ module.exports = { */ if (tokenAfter && astUtils.isSemicolonToken(tokenAfter) && !astUtils.isTokenOnSameLine(firstTokenOfLine, tokenAfter)) { offsets.setDesiredOffset(firstTokenOfLine, tokenAfter, 0); + } - if (validateTokenIndent(firstTokenOfLine, offsets.getDesiredIndent(tokenAfter))) { - return; - } + // If a comment matches the expected indentation of the token immediately before or after, don't report it. + if ( + mayAlignWithBefore && validateTokenIndent(firstTokenOfLine, offsets.getDesiredIndent(tokenBefore)) || + mayAlignWithAfter && validateTokenIndent(firstTokenOfLine, offsets.getDesiredIndent(tokenAfter)) + ) { + return; } }