Merge pull request #70169 from DougGregor/throws-clause

Adjust for throws-clause refactoring in swift-syntax

Author: DougGregor

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -333,7 +333,7 @@ extension ASTGenVisitor {
       parameterList: self.generate(functionParameterClause: node.signature.parameterClause),
       asyncSpecifierLoc: (node.signature.effectSpecifiers?.asyncSpecifier).bridgedSourceLoc(in: self),
       throwsSpecifierLoc: (node.signature.effectSpecifiers?.throwsSpecifier).bridgedSourceLoc(in: self),
-      thrownType: self.generate(type: node.signature.effectSpecifiers?.thrownError?.type),
+      thrownType: self.generate(type: node.signature.effectSpecifiers?.thrownError),
       returnType: self.generate(type: node.signature.returnClause?.type),
       genericWhereClause: self.generate(genericWhereClause: node.genericWhereClause)
     )
@@ -358,7 +358,7 @@ extension ASTGenVisitor {
       parameterList: self.generate(functionParameterClause: node.signature.parameterClause),
       asyncSpecifierLoc: (node.signature.effectSpecifiers?.asyncSpecifier).bridgedSourceLoc(in: self),
       throwsSpecifierLoc: (node.signature.effectSpecifiers?.throwsSpecifier).bridgedSourceLoc(in: self),
-      thrownType: self.generate(type: node.signature.effectSpecifiers?.thrownError?.type),
+      thrownType: self.generate(type: node.signature.effectSpecifiers?.thrownError),
       genericWhereClause: self.generate(genericWhereClause: node.genericWhereClause)
     )
 

lib/ASTGen/Sources/ASTGen/Types.swift

@@ -15,6 +15,12 @@ import BasicBridging
 import SwiftDiagnostics
 @_spi(ExperimentalLanguageFeatures) import SwiftSyntax
 
+extension EffectSpecifiersSyntax {
+  var thrownError: TypeSyntax? {
+    throwsClause?.type
+  }
+}
+
 /// Check if an `TypeSyntax` can be generated using ASTGen.
 ///
 /// If all the type nodes that shares the first token are migrated,
@@ -278,7 +284,7 @@ extension ASTGenVisitor {
       ),
       asyncLoc: (node.effectSpecifiers?.asyncSpecifier).bridgedSourceLoc(in: self),
       throwsLoc: (node.effectSpecifiers?.throwsSpecifier).bridgedSourceLoc(in: self),
-      thrownType: self.generate(type: node.effectSpecifiers?.thrownError?.type),
+      thrownType: self.generate(type: node.effectSpecifiers?.thrownError),
       arrowLoc: node.returnClause.arrow.bridgedSourceLoc(in: self),
       resultType: generate(type: node.returnClause.type)
     )