Add generic argument clause to macro expansion exprs/decls

CodeGeneration/Sources/SyntaxSupport/gyb_generated/DeclNodes.swift

@@ -1517,6 +1517,9 @@ public let DECL_NODES: [Node] = [
                tokenChoices: [
                  "Identifier"
                ]),
+         Child(name: "GenericArguments",
+               kind: "GenericArgumentClause",
+               isOptional: true),
          Child(name: "LeftParen",
                kind: "LeftParenToken",
                isOptional: true,

CodeGeneration/Sources/SyntaxSupport/gyb_generated/ExprNodes.swift

@@ -1303,6 +1303,9 @@ public let EXPR_NODES: [Node] = [
                tokenChoices: [
                  "Identifier"
                ]),
+         Child(name: "GenericArguments",
+               kind: "GenericArgumentClause",
+               isOptional: true),
          Child(name: "LeftParen",
                kind: "LeftParenToken",
                isOptional: true,

Sources/SwiftParser/Declarations.swift

@@ -2018,6 +2018,14 @@ extension Parser {
     let poundKeyword = self.consumeAnyToken()
     let (unexpectedBeforeMacro, macro) = self.expectIdentifier()
 
+    // Parse the optional generic argument list.
+    let generics: RawGenericArgumentClauseSyntax?
+    if self.lookahead().canParseAsGenericArgumentList() {
+      generics = self.parseGenericArguments()
+    } else {
+      generics = nil
+    }
+
     // Parse the optional parenthesized argument list.
     let leftParen = self.consume(if: .leftParen, where: { !$0.isAtStartOfLine })
     let args: [RawTupleExprElementSyntax]
@@ -2048,6 +2056,7 @@ extension Parser {
       poundToken: poundKeyword,
       unexpectedBeforeMacro,
       macro: macro,
+      genericArguments: generics,
       leftParen: leftParen,
       argumentList: RawTupleExprElementListSyntax(
         elements: args, arena: self.arena

Sources/SwiftParser/Expressions.swift

@@ -1163,6 +1163,14 @@ extension Parser {
     let poundKeyword = self.consumeAnyToken()
     let (unexpectedBeforeMacro, macro) = self.expectIdentifier()
 
+    // Parse the optional generic argument list.
+    let generics: RawGenericArgumentClauseSyntax?
+    if self.lookahead().canParseAsGenericArgumentList() {
+      generics = self.parseGenericArguments()
+    } else {
+      generics = nil
+    }
+
     // Parse the optional parenthesized argument list.
     let leftParen = self.consume(if: .leftParen, where: { !$0.isAtStartOfLine })
     let args: [RawTupleExprElementSyntax]
@@ -1191,6 +1199,7 @@ extension Parser {
       poundToken: poundKeyword,
       unexpectedBeforeMacro,
       macro: macro,
+      genericArguments: generics,
       leftParen: leftParen,
       argumentList: RawTupleExprElementListSyntax(
         elements: args, arena: self.arena

Sources/SwiftSyntax/Raw/gyb_generated/RawSyntaxNodes.swift

@@ -5920,7 +5920,9 @@ public struct RawMacroExpansionExprSyntax: RawExprSyntaxNodeProtocol, RawSyntaxT
     poundToken: RawTokenSyntax,
     _ unexpectedBetweenPoundTokenAndMacro: RawUnexpectedNodesSyntax? = nil,
     macro: RawTokenSyntax,
-    _ unexpectedBetweenMacroAndLeftParen: RawUnexpectedNodesSyntax? = nil,
+    _ unexpectedBetweenMacroAndGenericArguments: RawUnexpectedNodesSyntax? = nil,
+    genericArguments: RawGenericArgumentClauseSyntax?,
+    _ unexpectedBetweenGenericArgumentsAndLeftParen: RawUnexpectedNodesSyntax? = nil,
     leftParen: RawTokenSyntax?,
     _ unexpectedBetweenLeftParenAndArgumentList: RawUnexpectedNodesSyntax? = nil,
     argumentList: RawTupleExprElementListSyntax,
@@ -5934,23 +5936,25 @@ public struct RawMacroExpansionExprSyntax: RawExprSyntaxNodeProtocol, RawSyntaxT
     arena: __shared SyntaxArena
   ) {
     let raw = RawSyntax.makeLayout(
-      kind: .macroExpansionExpr, uninitializedCount: 15, arena: arena) { layout in
+      kind: .macroExpansionExpr, uninitializedCount: 17, arena: arena) { layout in
       layout.initialize(repeating: nil)
       layout[0] = unexpectedBeforePoundToken?.raw
       layout[1] = poundToken.raw
       layout[2] = unexpectedBetweenPoundTokenAndMacro?.raw
       layout[3] = macro.raw
-      layout[4] = unexpectedBetweenMacroAndLeftParen?.raw
-      layout[5] = leftParen?.raw
-      layout[6] = unexpectedBetweenLeftParenAndArgumentList?.raw
-      layout[7] = argumentList.raw
-      layout[8] = unexpectedBetweenArgumentListAndRightParen?.raw
-      layout[9] = rightParen?.raw
-      layout[10] = unexpectedBetweenRightParenAndTrailingClosure?.raw
-      layout[11] = trailingClosure?.raw
-      layout[12] = unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures?.raw
-      layout[13] = additionalTrailingClosures?.raw
-      layout[14] = unexpectedAfterAdditionalTrailingClosures?.raw
+      layout[4] = unexpectedBetweenMacroAndGenericArguments?.raw
+      layout[5] = genericArguments?.raw
+      layout[6] = unexpectedBetweenGenericArgumentsAndLeftParen?.raw
+      layout[7] = leftParen?.raw
+      layout[8] = unexpectedBetweenLeftParenAndArgumentList?.raw
+      layout[9] = argumentList.raw
+      layout[10] = unexpectedBetweenArgumentListAndRightParen?.raw
+      layout[11] = rightParen?.raw
+      layout[12] = unexpectedBetweenRightParenAndTrailingClosure?.raw
+      layout[13] = trailingClosure?.raw
+      layout[14] = unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures?.raw
+      layout[15] = additionalTrailingClosures?.raw
+      layout[16] = unexpectedAfterAdditionalTrailingClosures?.raw
     }
     self.init(raw: raw)
   }
@@ -5967,38 +5971,44 @@ public struct RawMacroExpansionExprSyntax: RawExprSyntaxNodeProtocol, RawSyntaxT
   public var macro: RawTokenSyntax {
     layoutView.children[3].map(RawTokenSyntax.init(raw:))!
   }
-  public var unexpectedBetweenMacroAndLeftParen: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenMacroAndGenericArguments: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
+  public var genericArguments: RawGenericArgumentClauseSyntax? {
+    layoutView.children[5].map(RawGenericArgumentClauseSyntax.init(raw:))
+  }
+  public var unexpectedBetweenGenericArgumentsAndLeftParen: RawUnexpectedNodesSyntax? {
+    layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
+  }
   public var leftParen: RawTokenSyntax? {
-    layoutView.children[5].map(RawTokenSyntax.init(raw:))
+    layoutView.children[7].map(RawTokenSyntax.init(raw:))
   }
   public var unexpectedBetweenLeftParenAndArgumentList: RawUnexpectedNodesSyntax? {
-    layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
+    layoutView.children[8].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   public var argumentList: RawTupleExprElementListSyntax {
-    layoutView.children[7].map(RawTupleExprElementListSyntax.init(raw:))!
+    layoutView.children[9].map(RawTupleExprElementListSyntax.init(raw:))!
   }
   public var unexpectedBetweenArgumentListAndRightParen: RawUnexpectedNodesSyntax? {
-    layoutView.children[8].map(RawUnexpectedNodesSyntax.init(raw:))
+    layoutView.children[10].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   public var rightParen: RawTokenSyntax? {
-    layoutView.children[9].map(RawTokenSyntax.init(raw:))
+    layoutView.children[11].map(RawTokenSyntax.init(raw:))
   }
   public var unexpectedBetweenRightParenAndTrailingClosure: RawUnexpectedNodesSyntax? {
-    layoutView.children[10].map(RawUnexpectedNodesSyntax.init(raw:))
+    layoutView.children[12].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   public var trailingClosure: RawClosureExprSyntax? {
-    layoutView.children[11].map(RawClosureExprSyntax.init(raw:))
+    layoutView.children[13].map(RawClosureExprSyntax.init(raw:))
   }
   public var unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures: RawUnexpectedNodesSyntax? {
-    layoutView.children[12].map(RawUnexpectedNodesSyntax.init(raw:))
+    layoutView.children[14].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   public var additionalTrailingClosures: RawMultipleTrailingClosureElementListSyntax? {
-    layoutView.children[13].map(RawMultipleTrailingClosureElementListSyntax.init(raw:))
+    layoutView.children[15].map(RawMultipleTrailingClosureElementListSyntax.init(raw:))
   }
   public var unexpectedAfterAdditionalTrailingClosures: RawUnexpectedNodesSyntax? {
-    layoutView.children[14].map(RawUnexpectedNodesSyntax.init(raw:))
+    layoutView.children[16].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 }
 
@@ -11143,7 +11153,9 @@ public struct RawMacroExpansionDeclSyntax: RawDeclSyntaxNodeProtocol, RawSyntaxT
     poundToken: RawTokenSyntax,
     _ unexpectedBetweenPoundTokenAndMacro: RawUnexpectedNodesSyntax? = nil,
     macro: RawTokenSyntax,
-    _ unexpectedBetweenMacroAndLeftParen: RawUnexpectedNodesSyntax? = nil,
+    _ unexpectedBetweenMacroAndGenericArguments: RawUnexpectedNodesSyntax? = nil,
+    genericArguments: RawGenericArgumentClauseSyntax?,
+    _ unexpectedBetweenGenericArgumentsAndLeftParen: RawUnexpectedNodesSyntax? = nil,
     leftParen: RawTokenSyntax?,
     _ unexpectedBetweenLeftParenAndArgumentList: RawUnexpectedNodesSyntax? = nil,
     argumentList: RawTupleExprElementListSyntax,
@@ -11157,23 +11169,25 @@ public struct RawMacroExpansionDeclSyntax: RawDeclSyntaxNodeProtocol, RawSyntaxT
     arena: __shared SyntaxArena
   ) {
     let raw = RawSyntax.makeLayout(
-      kind: .macroExpansionDecl, uninitializedCount: 15, arena: arena) { layout in
+      kind: .macroExpansionDecl, uninitializedCount: 17, arena: arena) { layout in
       layout.initialize(repeating: nil)
       layout[0] = unexpectedBeforePoundToken?.raw
       layout[1] = poundToken.raw
       layout[2] = unexpectedBetweenPoundTokenAndMacro?.raw
       layout[3] = macro.raw
-      layout[4] = unexpectedBetweenMacroAndLeftParen?.raw
-      layout[5] = leftParen?.raw
-      layout[6] = unexpectedBetweenLeftParenAndArgumentList?.raw
-      layout[7] = argumentList.raw
-      layout[8] = unexpectedBetweenArgumentListAndRightParen?.raw
-      layout[9] = rightParen?.raw
-      layout[10] = unexpectedBetweenRightParenAndTrailingClosure?.raw
-      layout[11] = trailingClosure?.raw
-      layout[12] = unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures?.raw
-      layout[13] = additionalTrailingClosures?.raw
-      layout[14] = unexpectedAfterAdditionalTrailingClosures?.raw
+      layout[4] = unexpectedBetweenMacroAndGenericArguments?.raw
+      layout[5] = genericArguments?.raw
+      layout[6] = unexpectedBetweenGenericArgumentsAndLeftParen?.raw
+      layout[7] = leftParen?.raw
+      layout[8] = unexpectedBetweenLeftParenAndArgumentList?.raw
+      layout[9] = argumentList.raw
+      layout[10] = unexpectedBetweenArgumentListAndRightParen?.raw
+      layout[11] = rightParen?.raw
+      layout[12] = unexpectedBetweenRightParenAndTrailingClosure?.raw
+      layout[13] = trailingClosure?.raw
+      layout[14] = unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures?.raw
+      layout[15] = additionalTrailingClosures?.raw
+      layout[16] = unexpectedAfterAdditionalTrailingClosures?.raw
     }
     self.init(raw: raw)
   }
@@ -11190,38 +11204,44 @@ public struct RawMacroExpansionDeclSyntax: RawDeclSyntaxNodeProtocol, RawSyntaxT
   public var macro: RawTokenSyntax {
     layoutView.children[3].map(RawTokenSyntax.init(raw:))!
   }
-  public var unexpectedBetweenMacroAndLeftParen: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenMacroAndGenericArguments: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
+  public var genericArguments: RawGenericArgumentClauseSyntax? {
+    layoutView.children[5].map(RawGenericArgumentClauseSyntax.init(raw:))
+  }
+  public var unexpectedBetweenGenericArgumentsAndLeftParen: RawUnexpectedNodesSyntax? {
+    layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
+  }
   public var leftParen: RawTokenSyntax? {
-    layoutView.children[5].map(RawTokenSyntax.init(raw:))
+    layoutView.children[7].map(RawTokenSyntax.init(raw:))
   }
   public var unexpectedBetweenLeftParenAndArgumentList: RawUnexpectedNodesSyntax? {
-    layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
+    layoutView.children[8].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   public var argumentList: RawTupleExprElementListSyntax {
-    layoutView.children[7].map(RawTupleExprElementListSyntax.init(raw:))!
+    layoutView.children[9].map(RawTupleExprElementListSyntax.init(raw:))!
   }
   public var unexpectedBetweenArgumentListAndRightParen: RawUnexpectedNodesSyntax? {
-    layoutView.children[8].map(RawUnexpectedNodesSyntax.init(raw:))
+    layoutView.children[10].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   public var rightParen: RawTokenSyntax? {
-    layoutView.children[9].map(RawTokenSyntax.init(raw:))
+    layoutView.children[11].map(RawTokenSyntax.init(raw:))
   }
   public var unexpectedBetweenRightParenAndTrailingClosure: RawUnexpectedNodesSyntax? {
-    layoutView.children[10].map(RawUnexpectedNodesSyntax.init(raw:))
+    layoutView.children[12].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   public var trailingClosure: RawClosureExprSyntax? {
-    layoutView.children[11].map(RawClosureExprSyntax.init(raw:))
+    layoutView.children[13].map(RawClosureExprSyntax.init(raw:))
   }
   public var unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures: RawUnexpectedNodesSyntax? {
-    layoutView.children[12].map(RawUnexpectedNodesSyntax.init(raw:))
+    layoutView.children[14].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   public var additionalTrailingClosures: RawMultipleTrailingClosureElementListSyntax? {
-    layoutView.children[13].map(RawMultipleTrailingClosureElementListSyntax.init(raw:))
+    layoutView.children[15].map(RawMultipleTrailingClosureElementListSyntax.init(raw:))
   }
   public var unexpectedAfterAdditionalTrailingClosures: RawUnexpectedNodesSyntax? {
-    layoutView.children[14].map(RawUnexpectedNodesSyntax.init(raw:))
+    layoutView.children[16].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 }
 

Sources/SwiftSyntax/Raw/gyb_generated/RawSyntaxValidation.swift

@@ -841,22 +841,24 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
     assertNoError(kind, 12, verify(layout[12], as: RawUnexpectedNodesSyntax?.self))
     break
   case .macroExpansionExpr:
-    assert(layout.count == 15)
+    assert(layout.count == 17)
     assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
     assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self))
     assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
     assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax.self))
     assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
-    assertNoError(kind, 5, verify(layout[5], as: RawTokenSyntax?.self))
+    assertNoError(kind, 5, verify(layout[5], as: RawGenericArgumentClauseSyntax?.self))
     assertNoError(kind, 6, verify(layout[6], as: RawUnexpectedNodesSyntax?.self))
-    assertNoError(kind, 7, verify(layout[7], as: RawTupleExprElementListSyntax.self))
+    assertNoError(kind, 7, verify(layout[7], as: RawTokenSyntax?.self))
     assertNoError(kind, 8, verify(layout[8], as: RawUnexpectedNodesSyntax?.self))
-    assertNoError(kind, 9, verify(layout[9], as: RawTokenSyntax?.self))
+    assertNoError(kind, 9, verify(layout[9], as: RawTupleExprElementListSyntax.self))
     assertNoError(kind, 10, verify(layout[10], as: RawUnexpectedNodesSyntax?.self))
-    assertNoError(kind, 11, verify(layout[11], as: RawClosureExprSyntax?.self))
+    assertNoError(kind, 11, verify(layout[11], as: RawTokenSyntax?.self))
     assertNoError(kind, 12, verify(layout[12], as: RawUnexpectedNodesSyntax?.self))
-    assertNoError(kind, 13, verify(layout[13], as: RawMultipleTrailingClosureElementListSyntax?.self))
+    assertNoError(kind, 13, verify(layout[13], as: RawClosureExprSyntax?.self))
     assertNoError(kind, 14, verify(layout[14], as: RawUnexpectedNodesSyntax?.self))
+    assertNoError(kind, 15, verify(layout[15], as: RawMultipleTrailingClosureElementListSyntax?.self))
+    assertNoError(kind, 16, verify(layout[16], as: RawUnexpectedNodesSyntax?.self))
     break
   case .postfixIfConfigExpr:
     assert(layout.count == 5)
@@ -1606,22 +1608,24 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
     assertNoError(kind, 6, verify(layout[6], as: RawUnexpectedNodesSyntax?.self))
     break
   case .macroExpansionDecl:
-    assert(layout.count == 15)
+    assert(layout.count == 17)
     assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
     assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self))
     assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
     assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax.self))
     assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
-    assertNoError(kind, 5, verify(layout[5], as: RawTokenSyntax?.self))
+    assertNoError(kind, 5, verify(layout[5], as: RawGenericArgumentClauseSyntax?.self))
     assertNoError(kind, 6, verify(layout[6], as: RawUnexpectedNodesSyntax?.self))
-    assertNoError(kind, 7, verify(layout[7], as: RawTupleExprElementListSyntax.self))
+    assertNoError(kind, 7, verify(layout[7], as: RawTokenSyntax?.self))
     assertNoError(kind, 8, verify(layout[8], as: RawUnexpectedNodesSyntax?.self))
-    assertNoError(kind, 9, verify(layout[9], as: RawTokenSyntax?.self))
+    assertNoError(kind, 9, verify(layout[9], as: RawTupleExprElementListSyntax.self))
     assertNoError(kind, 10, verify(layout[10], as: RawUnexpectedNodesSyntax?.self))
-    assertNoError(kind, 11, verify(layout[11], as: RawClosureExprSyntax?.self))
+    assertNoError(kind, 11, verify(layout[11], as: RawTokenSyntax?.self))
     assertNoError(kind, 12, verify(layout[12], as: RawUnexpectedNodesSyntax?.self))
-    assertNoError(kind, 13, verify(layout[13], as: RawMultipleTrailingClosureElementListSyntax?.self))
+    assertNoError(kind, 13, verify(layout[13], as: RawClosureExprSyntax?.self))
     assertNoError(kind, 14, verify(layout[14], as: RawUnexpectedNodesSyntax?.self))
+    assertNoError(kind, 15, verify(layout[15], as: RawMultipleTrailingClosureElementListSyntax?.self))
+    assertNoError(kind, 16, verify(layout[16], as: RawUnexpectedNodesSyntax?.self))
     break
   case .tokenList:
     for (index, element) in layout.enumerated() {