Merge pull request swiftlang#380 from chuckluck44/fix/where-clause-else-check

Author: allevato

Sources/SwiftFormatRules/UseWhereClausesInForLoops.swift

@@ -41,7 +41,8 @@ public final class UseWhereClausesInForLoops: SyntaxFormatRule {
     //    with a single condition whose body is just `continue`.
     switch stmt.item.as(SyntaxEnum.self) {
     case .ifStmt(let ifStmt)
-    where ifStmt.conditions.count == 1 && node.body.statements.count == 1:
+    where ifStmt.conditions.count == 1 && ifStmt.elseKeyword == nil
+      && node.body.statements.count == 1:
       // Extract the condition of the IfStmt.
       let conditionElement = ifStmt.conditions.first!
       guard let condition = conditionElement.condition.as(ExprSyntax.self) else {

Tests/SwiftFormatRulesTests/UseWhereClausesInForLoopsTests.swift

@@ -11,6 +11,22 @@ final class UseWhereClausesInForLoopsTests: LintOrFormatRuleTestCase {
                }
              }
 
+             for i in [0, 1, 2, 3] {
+               if i > 30 {
+                 print(i)
+               } else {
+                 print(i)
+               }
+             }
+
+             for i in [0, 1, 2, 3] {
+               if i > 30 {
+                 print(i)
+               } else if i > 40 {
+                 print(i)
+               }
+             }
+
              for i in [0, 1, 2, 3] {
                if i > 30 {
                  print(i)
@@ -36,6 +52,22 @@ final class UseWhereClausesInForLoopsTests: LintOrFormatRuleTestCase {
                     print(i)
                 }
 
+                for i in [0, 1, 2, 3] {
+                  if i > 30 {
+                    print(i)
+                  } else {
+                    print(i)
+                  }
+                }
+
+                for i in [0, 1, 2, 3] {
+                  if i > 30 {
+                    print(i)
+                  } else if i > 40 {
+                    print(i)
+                  }
+                }
+
                 for i in [0, 1, 2, 3] {
                   if i > 30 {
                     print(i)