Merge pull request #858 from CodaFi/captcha

Lookahead Through Balanced Brackets In Closure Capture Lists

Author: CodaFi

Sources/SwiftParser/Expressions.swift

@@ -2231,11 +2231,7 @@ extension Parser.Lookahead {
 
     // Skip by a closure capture list if present.
     if lookahead.consume(if: .leftSquareBracket) != nil {
-      var captureListProgress = LoopProgressCondition()
-      while !lookahead.at(any: [.eof, .rightSquareBracket]) && captureListProgress.evaluate(lookahead.currentToken) {
-        lookahead.consumeAnyToken()
-      }
-
+      lookahead.skipUntil(.rightSquareBracket, .rightSquareBracket)
       if lookahead.consume(if: .rightSquareBracket) == nil {
         return false
       }

Tests/SwiftParserTest/Expressions.swift

@@ -593,4 +593,21 @@ final class ExpressionTests: XCTestCase {
       substructureAfterMarker: "PLUS"
     )
   }
+
+  func testBogusCaptureLists() {
+    // N.B. This test ensures that capture list lookahead doesn't try to pair
+    // the opening square bracket from the array literal with the closing
+    // square bracket from the capture list.
+    AssertParse(
+      """
+      {
+          [
+              AboutItem(title: TextContent.legalAndMore, accessoryType: .disclosureIndicator, action: { [weak self] context in
+                  self?.tracker.buttonPressed(.legal)
+                  context.showSubmenu(title: TextContent.legalAndMore, configuration: LegalAndMoreSubmenuConfiguration())
+              }),
+          ]
+      }()
+      """)
+  }
 }