Merge pull request #2379 from DougGregor/throws-clause

Replace throwsSpecifier/thrownTypeClause with a unified throwsClause

Author: DougGregor

CodeGeneration/Sources/SyntaxSupport/CommonNodes.swift

@@ -81,29 +81,36 @@ public let COMMON_NODES: [Node] = [
   ),
 
   Node(
-    kind: .thrownTypeClause,
+    kind: .throwsClause,
     base: .syntax,
-    nameForDiagnostics: "thrown type clause",
-    documentation: "The specific error type that a function can throw.",
-    traits: [
-      "Parenthesized"
-    ],
+    nameForDiagnostics: "throws clause",
     children: [
+      Child(
+        name: "throwsSpecifier",
+        kind: .token(choices: [.keyword(.throws), .keyword(.rethrows)]),
+        documentation: "The `throws` keyword."
+      ),
       Child(
         name: "leftParen",
         kind: .token(choices: [.token(.leftParen)]),
-        documentation: "The '(' to open the thrown type clause."
+        experimentalFeature: .typedThrows,
+        documentation: "The '(' to open the thrown error type specification.",
+        isOptional: true
       ),
       Child(
         name: "type",
         kind: .node(kind: .type),
+        experimentalFeature: .typedThrows,
         nameForDiagnostics: "thrown type",
-        documentation: "The thrown error type."
+        documentation: "The thrown error type.",
+        isOptional: true
       ),
       Child(
         name: "rightParen",
         kind: .token(choices: [.token(.rightParen)]),
-        documentation: "The ')' to closure the thrown type clause."
+        experimentalFeature: .typedThrows,
+        documentation: "The ')' to close the thrown error type specification.",
+        isOptional: true
       ),
     ]
   ),
@@ -123,16 +130,9 @@ public let COMMON_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "throwsSpecifier",
-        kind: .token(choices: [.keyword(.throws)]),
-        documentation: "The `throws` keyword.",
-        isOptional: true
-      ),
-      Child(
-        name: "thrownError",
-        kind: .node(kind: .thrownTypeClause),
-        experimentalFeature: .typedThrows,
-        documentation: "The specific error type thrown by this accessor.",
+        name: "throwsClause",
+        kind: .node(kind: .throwsClause),
+        documentation: "The clause specifying thrown errors",
         isOptional: true
       ),
     ]
@@ -153,16 +153,9 @@ public let COMMON_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "throwsSpecifier",
-        kind: .token(choices: [.keyword(.throws), .keyword(.rethrows)]),
-        documentation: "The `throws` or `rethrows` keyword.",
-        isOptional: true
-      ),
-      Child(
-        name: "thrownError",
-        kind: .node(kind: .thrownTypeClause),
-        experimentalFeature: .typedThrows,
-        documentation: "The specific error type thrown by this function.",
+        name: "throwsClause",
+        kind: .node(kind: .throwsClause),
+        documentation: "The clause specifying thrown errors",
         isOptional: true
       ),
     ]
@@ -363,15 +356,9 @@ public let COMMON_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "throwsSpecifier",
-        kind: .token(choices: [.keyword(.throws)]),
-        isOptional: true
-      ),
-      Child(
-        name: "thrownError",
-        kind: .node(kind: .thrownTypeClause),
-        experimentalFeature: .typedThrows,
-        documentation: "The specific error type thrown by this function type.",
+        name: "throwsClause",
+        kind: .node(kind: .throwsClause),
+        documentation: "The clause specifying thrown errors",
         isOptional: true
       ),
     ]

CodeGeneration/Sources/SyntaxSupport/SyntaxNodeKind.swift

@@ -269,7 +269,7 @@ public enum SyntaxNodeKind: String, CaseIterable {
   case switchExpr
   case ternaryExpr
   case thenStmt
-  case thrownTypeClause
+  case throwsClause
   case throwStmt
   case tryExpr
   case tupleExpr

CodeGeneration/Sources/SyntaxSupport/Traits.swift

@@ -62,17 +62,9 @@ public let TRAITS: [Trait] = [
     children: [
       Child(name: "unexpectedBeforeAsyncSpecifier", kind: .node(kind: .unexpectedNodes), isOptional: true),
       Child(name: "asyncSpecifier", kind: .token(choices: [.keyword(.async), .keyword(.reasync)]), isOptional: true),
-      Child(name: "unexpectedBetweenAsyncSpecifierAndThrowsSpecifier", kind: .node(kind: .unexpectedNodes), isOptional: true),
-      Child(name: "throwsSpecifier", kind: .token(choices: [.keyword(.throws), .keyword(.rethrows)]), isOptional: true),
-      Child(name: "unexpectedBetweenThrowsSpecifierAndThrownError", kind: .node(kind: .unexpectedNodes), isOptional: true),
-      Child(
-        name: "thrownError",
-        kind: .node(kind: .thrownTypeClause),
-        experimentalFeature: .typedThrows,
-        documentation: "The specific thrown error type.",
-        isOptional: true
-      ),
-      Child(name: "unexpectedAfterThrownError", kind: .node(kind: .unexpectedNodes), isOptional: true),
+      Child(name: "unexpectedBetweenAsyncSpecifierAndThrowsClause", kind: .node(kind: .unexpectedNodes), isOptional: true),
+      Child(name: "throwsClause", kind: .node(kind: .throwsClause), isOptional: true),
+      Child(name: "unexpectedAfterThrowsClause", kind: .node(kind: .unexpectedNodes), isOptional: true),
     ]
   ),
   Trait(

CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift

@@ -225,11 +225,6 @@ class ValidateSyntaxNodes: XCTestCase {
           message: "child 'asyncSpecifier' has a single keyword as its only token choice and should thus be named 'asyncKeyword'"
             // To be consistent with AsyncSpecifier properties that can be both 'async' and 'reasync'
         ),
-        ValidationFailure(
-          node: .accessorEffectSpecifiers,
-          message: "child 'throwsSpecifier' has a single keyword as its only token choice and should thus be named 'throwsKeyword'"
-            // To be consistent with AsyncSpecifier properties that can be both 'async' and 'reasync'
-        ),
         ValidationFailure(
           node: .deinitializerEffectSpecifiers,
           message: "child 'asyncSpecifier' has a single keyword as its only token choice and should thus be named 'asyncKeyword'"
@@ -240,11 +235,6 @@ class ValidateSyntaxNodes: XCTestCase {
           message: "child 'asyncSpecifier' has a single keyword as its only token choice and should thus be named 'asyncKeyword'"
             // To be consistent with AsyncSpecifier properties that can be both 'async' and 'reasync'
         ),
-        ValidationFailure(
-          node: .typeEffectSpecifiers,
-          message: "child 'throwsSpecifier' has a single keyword as its only token choice and should thus be named 'throwsKeyword'"
-            // To be consistent with AsyncSpecifier properties that can be both 'async' and 'reasync'
-        ),
 
         // MARK: Two tokens with same kind in a node
         // If there are two tokens of the same kind in a node, we can't follow the naming rule without conflict

Examples/Sources/MacroExamples/Implementation/Peer/AddAsyncMacro.swift

@@ -127,7 +127,7 @@ public struct AddAsyncMacro: PeerMacro {
     funcDecl.signature.effectSpecifiers = FunctionEffectSpecifiersSyntax(
       leadingTrivia: .space,
       asyncSpecifier: .keyword(.async),
-      throwsSpecifier: isResultReturn ? .keyword(.throws) : nil
+      throwsClause: isResultReturn ? ThrowsClauseSyntax(throwsSpecifier: .keyword(.throws)) : nil
     )
 
     // add result type

Release Notes/511.md

@@ -28,6 +28,10 @@
   - Description: `CodeBlockSyntax` is now `SyntaxParseable`, so it can be used with string interpolations.
   - Pull Request: https://github.com/apple/swift-syntax/pull/2361
 
+- `ThrowsClause`
+  - Description: The `throwsSpecifier` for the effects nodes (`AccessorEffectSpecifiers`, `FunctionEffectSpecifiers`, `TypeEffectSpecifiers`, `EffectSpecifiers`) has been replaced with `throwsClause`, which captures both the throws specifier and the (optional) thrown error type, as introduced by SE-0413.
+  - Pull Request: https://github.com/apple/swift-syntax/pull/2379
+
 ## API Behavior Changes
 
 ## Deprecations