[unnecessary-else] Simplified if condition

palantir · Mar 24, 2019 · 674296a · 674296a
1 parent 88397d9
commit 674296a
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/rules/unnecessaryElseRule.ts b/src/rules/unnecessaryElseRule.ts
@@ -79,11 +79,13 @@ function walk(ctx: Lint.WalkContext<Options>): void {
                 ? getJumpStatement(getLastStatement(node.thenStatement))
                 : getJumpStatement(node.thenStatement);
 
-            if (jumpStatement !== undefined && node.elseStatement !== undefined) {
-                if (!utils.isIfStatement(node.elseStatement) || !ctx.options.allowElseIf) {
-                    const elseKeyword = getPositionOfElseKeyword(node, ts.SyntaxKind.ElseKeyword);
-                    ctx.addFailureAtNode(elseKeyword, Rule.FAILURE_STRING(jumpStatement));
-                }
+            if (
+                jumpStatement !== undefined &&
+                node.elseStatement !== undefined &&
+                (!utils.isIfStatement(node.elseStatement) || !ctx.options.allowElseIf)
+            ) {
+                const elseKeyword = getPositionOfElseKeyword(node, ts.SyntaxKind.ElseKeyword);
+                ctx.addFailureAtNode(elseKeyword, Rule.FAILURE_STRING(jumpStatement));
             }
         }
         return ts.forEachChild(node, cb);