Merge pull request #2689 from mateusrodriguesxyz/trailing-comma-2

ahoppen · web-flow · commit 6d9acfcf0479 · 2024-08-15T22:21:36.000-07:00
diff --git a/Sources/SwiftParser/Attributes.swift b/Sources/SwiftParser/Attributes.swift
@@ -374,7 +374,10 @@ extension Parser {
       }
     case nil:
       return parseAttribute(argumentMode: .customAttribute) { parser in
-        let arguments = parser.parseArgumentListElements(pattern: .none, allowTrailingComma: false)
+        let arguments = parser.parseArgumentListElements(
+          pattern: .none,
+          allowTrailingComma: true
+        )
         return .argumentList(RawLabeledExprListSyntax(elements: arguments, arena: parser.arena))
       }
     }
diff --git a/Sources/SwiftParser/Availability.swift b/Sources/SwiftParser/Availability.swift
@@ -47,7 +47,8 @@ extension Parser {
             arena: self.arena
           )
         )
-      } while keepGoing != nil && self.hasProgressed(&availabilityArgumentProgress)
+      } while keepGoing != nil
+        && self.hasProgressed(&availabilityArgumentProgress)
     }
 
     return RawAvailabilityArgumentListSyntax(elements: elements, arena: self.arena)
diff --git a/Sources/SwiftParser/Declarations.swift b/Sources/SwiftParser/Declarations.swift
@@ -492,7 +492,7 @@ extension Parser {
             arena: self.arena
           )
         )
-      } while keepGoing != nil && self.hasProgressed(&loopProgress)
+      } while keepGoing != nil && !atGenericParametersListTerminator() && self.hasProgressed(&loopProgress)
     }
 
     let whereClause: RawGenericWhereClauseSyntax?
@@ -519,6 +519,10 @@ extension Parser {
     )
   }
 
+  mutating func atGenericParametersListTerminator() -> Bool {
+    return self.at(prefix: ">")
+  }
+
   mutating func parseGenericWhereClause() -> RawGenericWhereClauseSyntax {
     let (unexpectedBeforeWhereKeyword, whereKeyword) = self.expect(.keyword(.where))
 
@@ -700,7 +704,7 @@ extension Parser {
             arena: self.arena
           )
         )
-      } while keepGoing != nil && self.hasProgressed(&loopProgress)
+      } while keepGoing != nil && !self.atWhereClauseListTerminator() && self.hasProgressed(&loopProgress)
     }
 
     return RawGenericWhereClauseSyntax(
@@ -710,6 +714,10 @@ extension Parser {
       arena: self.arena
     )
   }
+
+  mutating func atWhereClauseListTerminator() -> Bool {
+    return self.at(.leftBrace)
+  }
 }
 
 extension Parser {
@@ -2017,7 +2025,10 @@ extension Parser {
     let unexpectedBeforeRightParen: RawUnexpectedNodesSyntax?
     let rightParen: RawTokenSyntax?
     if leftParen != nil {
-      args = parseArgumentListElements(pattern: .none, allowTrailingComma: false)
+      args = parseArgumentListElements(
+        pattern: .none,
+        allowTrailingComma: true
+      )
       (unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)
     } else {
       args = []
diff --git a/Sources/SwiftParser/Expressions.swift b/Sources/SwiftParser/Expressions.swift
@@ -751,7 +751,7 @@ extension Parser {
         let args = self.parseArgumentListElements(
           pattern: pattern,
           flavor: flavor.callArgumentFlavor,
-          allowTrailingComma: experimentalFeatures.contains(.trailingComma)
+          allowTrailingComma: true
         )
         let (unexpectedBeforeRParen, rparen) = self.expect(.rightParen)
 
@@ -788,7 +788,10 @@ extension Parser {
         if self.at(.rightSquare) {
           args = []
         } else {
-          args = self.parseArgumentListElements(pattern: pattern, allowTrailingComma: false)
+          args = self.parseArgumentListElements(
+            pattern: pattern,
+            allowTrailingComma: true
+          )
         }
         let (unexpectedBeforeRSquare, rsquare) = self.expect(.rightSquare)
 
@@ -1021,7 +1024,10 @@ extension Parser {
         if self.at(.rightSquare) {
           args = []
         } else {
-          args = self.parseArgumentListElements(pattern: pattern, allowTrailingComma: false)
+          args = self.parseArgumentListElements(
+            pattern: pattern,
+            allowTrailingComma: true
+          )
         }
         let (unexpectedBeforeRSquare, rsquare) = self.expect(.rightSquare)
 
@@ -1313,7 +1319,10 @@ extension Parser {
     let unexpectedBeforeRightParen: RawUnexpectedNodesSyntax?
     let rightParen: RawTokenSyntax?
     if leftParen != nil {
-      args = parseArgumentListElements(pattern: pattern, allowTrailingComma: false)
+      args = parseArgumentListElements(
+        pattern: pattern,
+        allowTrailingComma: true
+      )
       (unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)
     } else {
       args = []
@@ -1429,7 +1438,7 @@ extension Parser {
     let (unexpectedBeforeLParen, lparen) = self.expect(.leftParen)
     let elements = self.parseArgumentListElements(
       pattern: pattern,
-      allowTrailingComma: experimentalFeatures.contains(.trailingComma)
+      allowTrailingComma: true
     )
     let (unexpectedBeforeRParen, rparen) = self.expect(.rightParen)
     return RawTupleExprSyntax(
@@ -1730,7 +1739,7 @@ extension Parser {
               arena: arena
             )
           )
-        } while keepGoing != nil && self.hasProgressed(&loopProgress)
+        } while keepGoing != nil && !self.atCaptureListTerminator() && self.hasProgressed(&loopProgress)
       }
       // We were promised a right square bracket, so we're going to get it.
       var unexpectedNodes = [RawSyntax]()
@@ -1817,6 +1826,10 @@ extension Parser {
     )
   }
 
+  mutating func atCaptureListTerminator() -> Bool {
+    return self.at(.rightSquare)
+  }
+
   mutating func parseClosureCaptureSpecifiers() -> RawClosureCaptureSpecifierSyntax? {
     // Check for the strength specifier: "weak", "unowned", or
     // "unowned(safe/unsafe)".
@@ -1928,7 +1941,7 @@ extension Parser {
   }
 
   mutating func atArgumentListTerminator(_ allowTrailingComma: Bool) -> Bool {
-    return allowTrailingComma && self.at(.rightParen)
+    return allowTrailingComma && (self.at(.rightParen) || self.at(.rightSquare))
   }
 }
 
@@ -2367,7 +2380,7 @@ extension Parser {
         } else {
           unexpectedPrePatternCase = nil
         }
-      } while keepGoing != nil && self.hasProgressed(&loopProgress)
+      } while keepGoing != nil && !self.atSwitchCaseListTerminator() && self.hasProgressed(&loopProgress)
     }
     let (unexpectedBeforeColon, colon) = self.expect(.colon)
     return RawSwitchCaseLabelSyntax(
@@ -2380,6 +2393,10 @@ extension Parser {
     )
   }
 
+  mutating func atSwitchCaseListTerminator() -> Bool {
+    return self.experimentalFeatures.contains(.trailingComma) && self.at(.colon)
+  }
+
   /// Parse a switch case with a 'default' label.
   mutating func parseSwitchDefaultLabel(
     _ handle: RecoveryConsumptionHandle
diff --git a/Sources/SwiftParser/Nominals.swift b/Sources/SwiftParser/Nominals.swift
@@ -315,7 +315,7 @@ extension Parser {
             arena: self.arena
           )
         )
-      } while keepGoing != nil && self.hasProgressed(&loopProgress)
+      } while keepGoing != nil && !self.atInheritanceListTerminator() && self.hasProgressed(&loopProgress)
     }
 
     let unexpectedAfterInheritedTypeCollection: RawUnexpectedNodesSyntax?
@@ -339,6 +339,10 @@ extension Parser {
     )
   }
 
+  mutating func atInheritanceListTerminator() -> Bool {
+    return self.experimentalFeatures.contains(.trailingComma) && (self.at(.leftBrace) || self.at(.keyword(.where)))
+  }
+
   mutating func parsePrimaryAssociatedTypes() -> RawPrimaryAssociatedTypeClauseSyntax {
     let langle = self.consumePrefix("<", as: .leftAngle)
     var associatedTypes = [RawPrimaryAssociatedTypeSyntax]()
diff --git a/Sources/SwiftParser/StringLiterals.swift b/Sources/SwiftParser/StringLiterals.swift
@@ -551,7 +551,10 @@ extension Parser {
         )
         let leftParen = self.expectWithoutRecoveryOrLeadingTrivia(.leftParen)
         let expressions = RawLabeledExprListSyntax(
-          elements: self.parseArgumentListElements(pattern: .none, allowTrailingComma: false),
+          elements: self.parseArgumentListElements(
+            pattern: .none,
+            allowTrailingComma: true
+          ),
           arena: self.arena
         )
 
diff --git a/Sources/SwiftParser/Types.swift b/Sources/SwiftParser/Types.swift
@@ -1024,7 +1024,10 @@ extension Parser {
       }
     case nil:  // Custom attribute
       return parseAttribute(argumentMode: .customAttribute) { parser in
-        let arguments = parser.parseArgumentListElements(pattern: .none, allowTrailingComma: false)
+        let arguments = parser.parseArgumentListElements(
+          pattern: .none,
+          allowTrailingComma: true
+        )
         return .argumentList(RawLabeledExprListSyntax(elements: arguments, arena: parser.arena))
       }
 
diff --git a/Tests/SwiftParserTest/TrailingCommaTests.swift b/Tests/SwiftParserTest/TrailingCommaTests.swift
diff --git a/Tests/SwiftParserTest/translated/IfconfigExprTests.swift b/Tests/SwiftParserTest/translated/IfconfigExprTests.swift

Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,10 @@ extension Parser {`
`374`	`374`	`}`
`375`	`375`	`case nil:`
`376`	`376`	`return parseAttribute(argumentMode: .customAttribute) { parser in`
`377`		`- let arguments = parser.parseArgumentListElements(pattern: .none, allowTrailingComma: false)`
	`377`	`+ let arguments = parser.parseArgumentListElements(`
	`378`	`+ pattern: .none,`
	`379`	`+ allowTrailingComma: true`
	`380`	`+ )`
`378`	`381`	`return .argumentList(RawLabeledExprListSyntax(elements: arguments, arena: parser.arena))`
`379`	`382`	`}`
`380`	`383`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ extension Parser {`
`47`	`47`	`arena: self.arena`
`48`	`48`	`)`
`49`	`49`	`)`
`50`		`- } while keepGoing != nil && self.hasProgressed(&availabilityArgumentProgress)`
	`50`	`+ } while keepGoing != nil`
	`51`	`+ && self.hasProgressed(&availabilityArgumentProgress)`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`return RawAvailabilityArgumentListSyntax(elements: elements, arena: self.arena)`
Original file line number	Diff line number	Diff line change
`@@ -492,7 +492,7 @@ extension Parser {`
`492`	`492`	`arena: self.arena`
`493`	`493`	`)`
`494`	`494`	`)`
`495`		`- } while keepGoing != nil && self.hasProgressed(&loopProgress)`
	`495`	`+ } while keepGoing != nil && !atGenericParametersListTerminator() && self.hasProgressed(&loopProgress)`
`496`	`496`	`}`
`497`	`497`
`498`	`498`	`let whereClause: RawGenericWhereClauseSyntax?`
`@@ -519,6 +519,10 @@ extension Parser {`
`519`	`519`	`)`
`520`	`520`	`}`
`521`	`521`
	`522`	`+ mutating func atGenericParametersListTerminator() -> Bool {`
	`523`	`+ return self.at(prefix: ">")`
	`524`	`+ }`
	`525`	`+`
`522`	`526`	`mutating func parseGenericWhereClause() -> RawGenericWhereClauseSyntax {`
`523`	`527`	`let (unexpectedBeforeWhereKeyword, whereKeyword) = self.expect(.keyword(.where))`
`524`	`528`
`@@ -700,7 +704,7 @@ extension Parser {`
`700`	`704`	`arena: self.arena`
`701`	`705`	`)`
`702`	`706`	`)`
`703`		`- } while keepGoing != nil && self.hasProgressed(&loopProgress)`
	`707`	`+ } while keepGoing != nil && !self.atWhereClauseListTerminator() && self.hasProgressed(&loopProgress)`
`704`	`708`	`}`
`705`	`709`
`706`	`710`	`return RawGenericWhereClauseSyntax(`
`@@ -710,6 +714,10 @@ extension Parser {`
`710`	`714`	`arena: self.arena`
`711`	`715`	`)`
`712`	`716`	`}`
	`717`	`+`
	`718`	`+ mutating func atWhereClauseListTerminator() -> Bool {`
	`719`	`+ return self.at(.leftBrace)`
	`720`	`+ }`
`713`	`721`	`}`
`714`	`722`
`715`	`723`	`extension Parser {`
`@@ -2017,7 +2025,10 @@ extension Parser {`
`2017`	`2025`	`let unexpectedBeforeRightParen: RawUnexpectedNodesSyntax?`
`2018`	`2026`	`let rightParen: RawTokenSyntax?`
`2019`	`2027`	`if leftParen != nil {`
`2020`		`- args = parseArgumentListElements(pattern: .none, allowTrailingComma: false)`
	`2028`	`+ args = parseArgumentListElements(`
	`2029`	`+ pattern: .none,`
	`2030`	`+ allowTrailingComma: true`
	`2031`	`+ )`
`2021`	`2032`	`(unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)`
`2022`	`2033`	`} else {`
`2023`	`2034`	`args = []`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ extension Parser {`
`315`	`315`	`arena: self.arena`
`316`	`316`	`)`
`317`	`317`	`)`
`318`		`- } while keepGoing != nil && self.hasProgressed(&loopProgress)`
	`318`	`+ } while keepGoing != nil && !self.atInheritanceListTerminator() && self.hasProgressed(&loopProgress)`
`319`	`319`	`}`
`320`	`320`
`321`	`321`	`let unexpectedAfterInheritedTypeCollection: RawUnexpectedNodesSyntax?`
`@@ -339,6 +339,10 @@ extension Parser {`
`339`	`339`	`)`
`340`	`340`	`}`
`341`	`341`
	`342`	`+ mutating func atInheritanceListTerminator() -> Bool {`
	`343`	`+ return self.experimentalFeatures.contains(.trailingComma) && (self.at(.leftBrace) \|\| self.at(.keyword(.where)))`
	`344`	`+ }`
	`345`	`+`
`342`	`346`	`mutating func parsePrimaryAssociatedTypes() -> RawPrimaryAssociatedTypeClauseSyntax {`
`343`	`347`	`let langle = self.consumePrefix("<", as: .leftAngle)`
`344`	`348`	`var associatedTypes = [RawPrimaryAssociatedTypeSyntax]()`
Original file line number	Diff line number	Diff line change
`@@ -551,7 +551,10 @@ extension Parser {`
`551`	`551`	`)`
`552`	`552`	`let leftParen = self.expectWithoutRecoveryOrLeadingTrivia(.leftParen)`
`553`	`553`	`let expressions = RawLabeledExprListSyntax(`
`554`		`- elements: self.parseArgumentListElements(pattern: .none, allowTrailingComma: false),`
	`554`	`+ elements: self.parseArgumentListElements(`
	`555`	`+ pattern: .none,`
	`556`	`+ allowTrailingComma: true`
	`557`	`+ ),`
`555`	`558`	`arena: self.arena`
`556`	`559`	`)`
`557`	`560`
Original file line number	Diff line number	Diff line change
`@@ -1024,7 +1024,10 @@ extension Parser {`
`1024`	`1024`	`}`
`1025`	`1025`	`case nil: // Custom attribute`
`1026`	`1026`	`return parseAttribute(argumentMode: .customAttribute) { parser in`
`1027`		`- let arguments = parser.parseArgumentListElements(pattern: .none, allowTrailingComma: false)`
	`1027`	`+ let arguments = parser.parseArgumentListElements(`
	`1028`	`+ pattern: .none,`
	`1029`	`+ allowTrailingComma: true`
	`1030`	`+ )`
`1028`	`1031`	`return .argumentList(RawLabeledExprListSyntax(elements: arguments, arena: parser.arena))`
`1029`	`1032`	`}`
`1030`	`1033`