Merge pull request #216 from dylansturg/nondiscretionary_try_breaks

Use non-discretionary newlines in the break after `try` keyword.
apple · Aug 5, 2020 · 35fdb4f · 35fdb4f
2 parents ed45527 + cc6f926
commit 35fdb4f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift b/Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift
@@ -1420,7 +1420,9 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
   }
 
   override func visit(_ node: TryExprSyntax) -> SyntaxVisitorContinueKind {
-    before(node.expression.firstToken, tokens: .break)
+    before(
+      node.expression.firstToken,
+      tokens: .break(.continue, newlines: .elective(ignoresDiscretionary: true)))
 
     // Check for an anchor token inside of the expression to group with the try keyword.
     if let anchorToken = findTryExprConnectingToken(inExpr: node.expression) {

diff --git a/Tests/SwiftFormatPrettyPrintTests/TryCatchTests.swift b/Tests/SwiftFormatPrettyPrintTests/TryCatchTests.swift
@@ -236,6 +236,8 @@ final class TryCatchTests: PrettyPrintTestCase {
     let input =
       """
       let aVeryLongArgumentName = try foo.bar()
+      let aVeryLongArgumentName = try
+        foo.bar()
       let aVeryLongArgumentName = try? foo.bar()
       let abc = try foo.baz().quxxe(a, b, c).bar()
       let abc = try foo
@@ -246,10 +248,15 @@ final class TryCatchTests: PrettyPrintTestCase {
       let abc = try foo.baz().quxxe(a, b, c).bar[0]
       let abc = try foo
         .baz().quxxe(a, b, c).bar[0]
+      let abc = try
+        foo
+        .baz().quxxe(a, b, c).bar[0]
       """
 
     let expected =
       """
+      let aVeryLongArgumentName =
+        try foo.bar()
       let aVeryLongArgumentName =
         try foo.bar()
       let aVeryLongArgumentName =
@@ -268,6 +275,9 @@ final class TryCatchTests: PrettyPrintTestCase {
       let abc =
         try foo
         .baz().quxxe(a, b, c).bar[0]
+      let abc =
+        try foo
+        .baz().quxxe(a, b, c).bar[0]
 
       """