Merge pull request #191 from dylansturg/aggressive_ifs

Move open group token past ifstmt's if token to avoid extra newlines.

Author: allevato

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -1310,7 +1310,7 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
     // This group applies to a top-level if-stmt so that all of the bodies will have the same
     // breaking behavior.
     if let ifStmt = node.item.as(IfStmtSyntax.self) {
-      before(ifStmt.firstToken, tokens: .open(.consistent))
+      before(ifStmt.conditions.firstToken, tokens: .open(.consistent))
       after(ifStmt.lastToken, tokens: .close)
     }
     return .visitChildren

Tests/SwiftFormatPrettyPrintTests/IfStmtTests.swift

@@ -521,47 +521,51 @@ final class IfStmtTests: PrettyPrintTestCase {
   func testMultipleIfStmts() {
     let input =
       """
-      if foo && bar { baz() } else if bar { baz() } else if foo { baz() } else { blargh() }
-      if foo && bar && quxxe { baz() } else if bar { baz() } else if foo { baz() } else if quxxe { baz() } else { blargh() }
-      if let foo = getmyfoo(), let bar = getmybar(), foo.baz && bar.baz { foo() } else { bar() }
-      if let foo = getmyfoo(), let bar = getmybar(), foo.baz && bar.baz && someOtherCondition { foo() } else { bar() }
-      if let foo = getmyfoo(), let bar = getmybar(), foo.baz && bar.baz && someOtherCondition { foo() }
+      func foo() {
+        if foo && bar { baz() } else if bar { baz() } else if foo { baz() } else { blargh() }
+        if foo && bar && quxxe { baz() } else if bar { baz() } else if foo { baz() } else if quxxe { baz() } else { blargh() }
+        if let foo = getmyfoo(), let bar = getmybar(), foo.baz && bar.baz { foo() } else { bar() }
+        if let foo = getmyfoo(), let bar = getmybar(), foo.baz && bar.baz && someOtherCondition { foo() } else { bar() }
+        if let foo = getmyfoo(), let bar = getmybar(), foo.baz && bar.baz && someOtherCondition { foo() }
+      }
       """
 
     let expected =
       """
-      if foo && bar { baz() } else if bar { baz() } else if foo { baz() } else { blargh() }
-      if foo && bar && quxxe {
-        baz()
-      } else if bar {
-        baz()
-      } else if foo {
-        baz()
-      } else if quxxe {
-        baz()
-      } else {
-        blargh()
-      }
-      if let foo = getmyfoo(), let bar = getmybar(), foo.baz && bar.baz {
-        foo()
-      } else {
-        bar()
-      }
-      if let foo = getmyfoo(), let bar = getmybar(),
-        foo.baz && bar.baz && someOtherCondition
-      {
-        foo()
-      } else {
-        bar()
-      }
-      if let foo = getmyfoo(), let bar = getmybar(),
-        foo.baz && bar.baz && someOtherCondition
-      {
-        foo()
+      func foo() {
+        if foo && bar { baz() } else if bar { baz() } else if foo { baz() } else { blargh() }
+        if foo && bar && quxxe {
+          baz()
+        } else if bar {
+          baz()
+        } else if foo {
+          baz()
+        } else if quxxe {
+          baz()
+        } else {
+          blargh()
+        }
+        if let foo = getmyfoo(), let bar = getmybar(), foo.baz && bar.baz {
+          foo()
+        } else {
+          bar()
+        }
+        if let foo = getmyfoo(), let bar = getmybar(),
+          foo.baz && bar.baz && someOtherCondition
+        {
+          foo()
+        } else {
+          bar()
+        }
+        if let foo = getmyfoo(), let bar = getmybar(),
+          foo.baz && bar.baz && someOtherCondition
+        {
+          foo()
+        }
       }
 
       """
 
-    assertPrettyPrintEqual(input: input, expected: expected, linelength: 85)
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 87)
   }
 }