Merge pull request #2974 from rintaro/layout-parseable-impl

[CodeGeneration]  Minimize per-type `parse(from:)` code

Author: rintaro

CodeGeneration/Sources/generate-swift-syntax/templates/swiftparser/LayoutNodesParsableFile.swift

@@ -25,23 +25,38 @@ let layoutNodesParsableFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
     }
     """
   )
+  DeclSyntax(
+    """
+    extension SyntaxParseable {
+      fileprivate static func parse(
+        from parser: inout Parser,
+        parse: (_ parser: inout Parser) -> some RawSyntaxNodeProtocol
+      ) -> Self {
+        // Keep the parser alive so that the arena in which `raw` is allocated
+        // doesn’t get deallocated before we have a chance to create a syntax node
+        // from it. We can’t use `parser.arena` as the parameter to
+        // `Syntax(raw:arena:)` because the node might have been re-used during an
+        // incremental parse and would then live in a different arena than
+        // `parser.arena`.
+        defer {
+          withExtendedLifetime(parser) {
+          }
+        }
+        let node = parse(&parser)
+        let raw = RawSyntax(parser.parseRemainder(into: node))
+        return Syntax(raw: raw, rawNodeArena: raw.arena).cast(Self.self)
+      }
+    }
+    """
+  )
 
   for node in SYNTAX_NODES {
     if let parserFunction = node.parserFunction {
       DeclSyntax(
         """
         extension \(node.kind.syntaxType): SyntaxParseable {
           public static func parse(from parser: inout Parser) -> Self {
-            // Keep the parser alive so that the arena in which `raw` is allocated
-            // doesn’t get deallocated before we have a chance to create a syntax node
-            // from it. We can’t use `parser.arena` as the parameter to
-            // `Syntax(raw:arena:)` because the node might have been re-used during an
-            // incremental parse and would then live in a different arena than
-            // `parser.arena`.
-            defer { withExtendedLifetime(parser) {} }
-            let node = parser.\(parserFunction)()
-            let raw = RawSyntax(parser.parseRemainder(into: node))
-            return Syntax(raw: raw, rawNodeArena: raw.arena).cast(Self.self)
+            parse(from: &parser) { $0.\(parserFunction)() }
           }
         }
         """

Sources/SwiftParser/CollectionNodes+Parsable.swift

@@ -16,8 +16,8 @@
 @_spi(RawSyntax) import SwiftSyntax
 #endif
 
-fileprivate extension SyntaxCollection {
-  static func parse(
+extension SyntaxCollection where Self: SyntaxParseable {
+  fileprivate static func parse(
     from parser: inout Parser,
     parse: (_ parser: inout Parser) -> some RawSyntaxNodeProtocol,
     makeMissing: (_ remainingTokens: [RawSyntax], _ arena: RawSyntaxArena) -> some RawSyntaxNodeProtocol