Skip tokens in canRecoverTo when a closing delimiter is found at the same line

Author: mateusrodriguesxyz

Sources/SwiftParser/Recovery.swift

@@ -123,13 +123,33 @@ extension Parser.Lookahead {
       if currentTokenPrecedence >= recoveryPrecedence {
         break
       }
-      self.consumeAnyToken()
       if let closingDelimiter = currentTokenPrecedence.closingTokenKind {
         let closingDelimiterSpec = TokenSpec(closingDelimiter)
+        let canCloseAtSameLine: Int? = self.withLookahead { lookahead in
+          var tokensToSkip = 0
+          while !lookahead.at(.endOfFile), !lookahead.currentToken.isAtStartOfLine {
+            tokensToSkip += 1
+            if lookahead.at(closingDelimiterSpec) {
+              return tokensToSkip
+            } else {
+              lookahead.consumeAnyToken()
+            }
+          }
+          return nil
+        }
+        if let tokensToSkip = canCloseAtSameLine {
+          for _ in 0..<tokensToSkip {
+            self.consumeAnyToken()
+          }
+          continue
+        }
+        self.consumeAnyToken()
         guard self.canRecoverTo(closingDelimiterSpec) != nil else {
           continue
         }
         self.eat(closingDelimiterSpec)
+      } else {
+        self.consumeAnyToken()
       }
     }
 

Tests/SwiftBasicFormatTest/BasicFormatTests.swift

@@ -53,15 +53,6 @@ fileprivate func assertFormattingRoundTrips(
 }
 
 final class BasicFormatTest: XCTestCase {
-  func testClosureParameter() {
-    let source = """
-      myFunc({
-          return true
-      })
-      """
-    assertFormatted(source: source, expected: source)
-  }
-
   func testNotIndented() {
     assertFormatted(
       source: """

Tests/SwiftParserTest/translated/RecoveryTests.swift

@@ -1935,19 +1935,12 @@ final class RecoveryTests: ParserTestCase {
     assertParse(
       """
       struct ErrorInFunctionSignatureResultArrayType11 {
-        func foo() -> Int1️⃣[(a){a++}2️⃣] {
+        func foo() -> Int1️⃣[(a){a++}] {
         }
       }
       """,
       diagnostics: [
-        DiagnosticSpec(
-          locationMarker: "1️⃣",
-          message: "unexpected code '[(a)' in function"
-        ),
-        DiagnosticSpec(
-          locationMarker: "2️⃣",
-          message: "unexpected code in struct"
-        )
+        DiagnosticSpec(message: "unexpected code '[(a){a++}]' in function")
       ]
     )
   }