Merge pull request #2412 from DougGregor/se-0413-typed-throws-accepted

[SE-0413] Typed throws: enable by default

Author: DougGregor

CodeGeneration/Sources/SyntaxSupport/CommonNodes.swift

@@ -93,22 +93,19 @@ public let COMMON_NODES: [Node] = [
       Child(
         name: "leftParen",
         kind: .token(choices: [.token(.leftParen)]),
-        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.",
         isOptional: true
       ),
       Child(
         name: "rightParen",
         kind: .token(choices: [.token(.rightParen)]),
-        experimentalFeature: .typedThrows,
         documentation: "The ')' to close the thrown error type specification.",
         isOptional: true
       ),

CodeGeneration/Sources/SyntaxSupport/ExperimentalFeatures.swift

@@ -15,7 +15,6 @@ import SwiftSyntax
 public enum ExperimentalFeature: String, CaseIterable {
   case referenceBindings
   case thenStatements
-  case typedThrows
   case doExpressions
   case nonescapableTypes
   case transferringArgsAndResults
@@ -27,8 +26,6 @@ public enum ExperimentalFeature: String, CaseIterable {
       return "reference bindings"
     case .thenStatements:
       return "'then' statements"
-    case .typedThrows:
-      return "typed throws"
     case .doExpressions:
       return "'do' expressions"
     case .nonescapableTypes:

CodeGeneration/Sources/SyntaxSupport/StmtNodes.swift

@@ -219,7 +219,6 @@ public let STMT_NODES: [Node] = [
       Child(
         name: "throwsClause",
         kind: .node(kind: .throwsClause),
-        experimentalFeature: .typedThrows,
         documentation: "The clause specifying the type of errors thrown from the 'do' block.",
         isOptional: true
       ),

Sources/SwiftParser/Specifiers.swift

@@ -584,7 +584,7 @@ extension TokenConsumer {
 extension Parser {
   /// Parse a throws clause after we've already parsed the 'throws' keyword to introduce it.
   mutating func parseThrowsClause(after throwsKeyword: RawTokenSyntax) -> RawThrowsClauseSyntax {
-    guard experimentalFeatures.contains(.typedThrows), let leftParen = self.consume(if: .leftParen) else {
+    guard let leftParen = self.consume(if: .leftParen) else {
       return RawThrowsClauseSyntax(
         throwsSpecifier: throwsKeyword,
         leftParen: nil,

Sources/SwiftParser/generated/ExperimentalFeatures.swift

@@ -30,15 +30,12 @@ extension Parser.ExperimentalFeatures {
   /// Whether to enable the parsing of 'then' statements.
   public static let thenStatements = Self (rawValue: 1 << 1)
 
-  /// Whether to enable the parsing of typed throws.
-  public static let typedThrows = Self (rawValue: 1 << 2)
-  
   /// Whether to enable the parsing of 'do' expressions.
-  public static let doExpressions = Self (rawValue: 1 << 3)
+  public static let doExpressions = Self (rawValue: 1 << 2)
 
   /// Whether to enable the parsing of NonEscableTypes.
-  public static let nonescapableTypes = Self (rawValue: 1 << 4)
+  public static let nonescapableTypes = Self (rawValue: 1 << 3)
 
   /// Whether to enable the parsing of TransferringArgsAndResults.
-  public static let transferringArgsAndResults = Self (rawValue: 1 << 5)
+  public static let transferringArgsAndResults = Self (rawValue: 1 << 4)
 }

Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesD.swift

@@ -3513,7 +3513,6 @@ public struct DoStmtSyntax: StmtSyntaxProtocol, SyntaxHashable, _LeafStmtSyntaxN
   }
 
   /// The clause specifying the type of errors thrown from the 'do' block.
-  @_spi(ExperimentalLanguageFeatures)
   public var throwsClause: ThrowsClauseSyntax? {
     get {
       return Syntax(self).child(at: 3)?.cast(ThrowsClauseSyntax.self)

Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesTUVWXYZ.swift

@@ -589,7 +589,6 @@ public struct ThrowsClauseSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNod
   /// ### Tokens
   /// 
   /// For syntax trees generated by the parser, this is guaranteed to be `(`.
-  @_spi(ExperimentalLanguageFeatures)
   public var leftParen: TokenSyntax? {
     get {
       return Syntax(self).child(at: 3)?.cast(TokenSyntax.self)
@@ -609,7 +608,6 @@ public struct ThrowsClauseSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNod
   }
 
   /// The thrown error type.
-  @_spi(ExperimentalLanguageFeatures)
   public var type: TypeSyntax? {
     get {
       return Syntax(self).child(at: 5)?.cast(TypeSyntax.self)
@@ -633,7 +631,6 @@ public struct ThrowsClauseSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNod
   /// ### Tokens
   /// 
   /// For syntax trees generated by the parser, this is guaranteed to be `)`.
-  @_spi(ExperimentalLanguageFeatures)
   public var rightParen: TokenSyntax? {
     get {
       return Syntax(self).child(at: 7)?.cast(TokenSyntax.self)

Tests/SwiftParserTest/DeclarationTests.swift

@@ -930,26 +930,23 @@ final class DeclarationTests: ParserTestCase {
 
   func testTypedThrows() {
     assertParse(
-      "func test() throws(any Error) -> Int { }",
-      experimentalFeatures: [.typedThrows]
+      "func test() throws(any Error) -> Int { }"
     )
 
     assertParse(
       """
       struct X {
         init() throws(any Error) { }
       }
-      """,
-      experimentalFeatures: [.typedThrows]
+      """
     )
 
     assertParse(
       "func test() throws(MyError) 1️⃣async {}",
       diagnostics: [
         DiagnosticSpec(message: "'async' must precede 'throws'", fixIts: ["move 'async' in front of 'throws'"])
       ],
-      fixedSource: "func test() async throws(MyError) {}",
-      experimentalFeatures: [.typedThrows]
+      fixedSource: "func test() async throws(MyError) {}"
     )
 
     assertParse(
@@ -958,8 +955,7 @@ final class DeclarationTests: ParserTestCase {
         DiagnosticSpec(locationMarker: "1️⃣", message: "'async' must precede 'throws'", fixIts: ["move 'async' in front of 'throws'"]),
         DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code '(MyError)' in function"),
       ],
-      fixedSource: "func test() async throws (MyError) {}",
-      experimentalFeatures: [.typedThrows]
+      fixedSource: "func test() async throws (MyError) {}"
     )
 
     assertParse(
@@ -968,8 +964,7 @@ final class DeclarationTests: ParserTestCase {
         DiagnosticSpec(locationMarker: "1️⃣", message: "expected throwing specifier; did you mean 'throws'?", fixIts: ["replace 'try' with 'throws'"]),
         DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code '(MyError) async' in function"),
       ],
-      fixedSource: "func test() throws (MyError) async {}",
-      experimentalFeatures: [.typedThrows]
+      fixedSource: "func test() throws (MyError) async {}"
     )
 
     assertParse(
@@ -979,17 +974,15 @@ final class DeclarationTests: ParserTestCase {
         DiagnosticSpec(locationMarker: "2️⃣", message: "'async' must precede 'throws'", fixIts: ["move 'async' in front of 'throws'"]),
         DiagnosticSpec(locationMarker: "3️⃣", message: "unexpected code '(MyError)' in function"),
       ],
-      fixedSource: "func test() async throws (MyError) {}",
-      experimentalFeatures: [.typedThrows]
+      fixedSource: "func test() async throws (MyError) {}"
     )
 
     assertParse(
       "func test() throws(MyError) 1️⃣await {}",
       diagnostics: [
         DiagnosticSpec(locationMarker: "1️⃣", message: "'await' must precede 'throws'", fixIts: ["move 'await' in front of 'throws'"])
       ],
-      fixedSource: "func test() async throws(MyError) {}",
-      experimentalFeatures: [.typedThrows]
+      fixedSource: "func test() async throws(MyError) {}"
     )
 
     assertParse(
@@ -998,8 +991,7 @@ final class DeclarationTests: ParserTestCase {
         DiagnosticSpec(locationMarker: "1️⃣", message: "'await' must precede 'throws'", fixIts: ["move 'await' in front of 'throws'"]),
         DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code '(MyError)' in function"),
       ],
-      fixedSource: "func test() async throws (MyError) {}",
-      experimentalFeatures: [.typedThrows]
+      fixedSource: "func test() async throws (MyError) {}"
     )
 
     assertParse(
@@ -1008,8 +1000,7 @@ final class DeclarationTests: ParserTestCase {
         DiagnosticSpec(locationMarker: "1️⃣", message: "expected throwing specifier; did you mean 'throws'?", fixIts: ["replace 'try' with 'throws'"]),
         DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code '(MyError) await' in function"),
       ],
-      fixedSource: "func test() throws (MyError) await {}",
-      experimentalFeatures: [.typedThrows]
+      fixedSource: "func test() throws (MyError) await {}"
     )
 
     assertParse(
@@ -1018,16 +1009,14 @@ final class DeclarationTests: ParserTestCase {
         DiagnosticSpec(locationMarker: "1️⃣", message: "expected throwing specifier; did you mean 'throws'?", fixIts: ["replace 'try' with 'throws'"]),
         DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code '(MyError)' in function"),
       ],
-      fixedSource: "func test() awaitthrows (MyError) {}",  // FIXME: spacing
-      experimentalFeatures: [.typedThrows]
+      fixedSource: "func test() awaitthrows (MyError) {}"  // FIXME: spacing
     )
 
     assertParse(
       "func test() async1️⃣(MyError) {}",
       diagnostics: [
         DiagnosticSpec(message: "unexpected code '(MyError)' in function")
-      ],
-      experimentalFeatures: [.typedThrows]
+      ]
     )
 
     assertParse(
@@ -1036,8 +1025,7 @@ final class DeclarationTests: ParserTestCase {
         DiagnosticSpec(locationMarker: "1️⃣", message: "expected async specifier; did you mean 'async'?", fixIts: ["replace 'await' with 'async'"]),
         DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code '(MyError)' in function"),
       ],
-      fixedSource: "func test() async (MyError) {}",
-      experimentalFeatures: [.typedThrows]
+      fixedSource: "func test() async (MyError) {}"
     )
 
     assertParse(
@@ -1046,22 +1034,19 @@ final class DeclarationTests: ParserTestCase {
         DiagnosticSpec(locationMarker: "1️⃣", message: "expected throwing specifier; did you mean 'throws'?", fixIts: ["replace 'try' with 'throws'"]),
         DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code '(MyError)' in function"),
       ],
-      fixedSource: "func test() throws (MyError) {}",
-      experimentalFeatures: [.typedThrows]
+      fixedSource: "func test() throws (MyError) {}"
     )
 
     assertParse(
-      "func test() throws(MyError) {}",
-      experimentalFeatures: [.typedThrows]
+      "func test() throws(MyError) {}"
     )
 
     assertParse(
       "func test() throws(MyError)1️⃣async {}",  // no space between closing parenthesis and `async`
       diagnostics: [
         DiagnosticSpec(message: "'async' must precede 'throws'", fixIts: ["move 'async' in front of 'throws'"])
       ],
-      fixedSource: "func test() async throws(MyError){}",
-      experimentalFeatures: [.typedThrows]
+      fixedSource: "func test() async throws(MyError){}"
     )
   }
 

Tests/SwiftParserTest/ExpressionTests.swift

@@ -2823,46 +2823,40 @@ final class StatementExpressionTests: ParserTestCase {
       diagnostics: [
         DiagnosticSpec(message: "'async' must precede 'throws'", fixIts: ["move 'async' in front of 'throws'"])
       ],
-      fixedSource: "[() async throws(MyError) -> Void]()",
-      experimentalFeatures: .typedThrows
+      fixedSource: "[() async throws(MyError) -> Void]()"
     )
     assertParse(
       "[() throws 1️⃣async2️⃣(MyError) -> Void]()",
       diagnostics: [
         DiagnosticSpec(locationMarker: "1️⃣", message: "'async' must precede 'throws'", fixIts: ["move 'async' in front of 'throws'"]),
         DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code '(MyError)' in array element"),
       ],
-      fixedSource: "[() async throws (MyError) -> Void]()",
-      experimentalFeatures: .typedThrows
+      fixedSource: "[() async throws (MyError) -> Void]()"
     )
     assertParse(
       "[() 1️⃣try(MyError) async -> Void]()",
       diagnostics: [DiagnosticSpec(message: "expected ',' in array element", fixIts: ["insert ','"])],
-      fixedSource: "[(), try(MyError) async -> Void]()",
-      experimentalFeatures: .typedThrows
+      fixedSource: "[(), try(MyError) async -> Void]()"
     )
     assertParse(
       "[() 1️⃣try async(MyError) -> Void]()",
       diagnostics: [DiagnosticSpec(message: "expected ',' in array element", fixIts: ["insert ','"])],
-      fixedSource: "[(), try async(MyError) -> Void]()",
-      experimentalFeatures: .typedThrows
+      fixedSource: "[(), try async(MyError) -> Void]()"
     )
     assertParse(
       "[() throws(MyError) 1️⃣await -> Void]()",
       diagnostics: [
         DiagnosticSpec(locationMarker: "1️⃣", message: "'await' must precede 'throws'", fixIts: ["move 'await' in front of 'throws'"])
       ],
-      fixedSource: "[() async throws(MyError) -> Void]()",
-      experimentalFeatures: .typedThrows
+      fixedSource: "[() async throws(MyError) -> Void]()"
     )
     assertParse(
       "[() throws 1️⃣await2️⃣(MyError) -> Void]()",
       diagnostics: [
         DiagnosticSpec(locationMarker: "1️⃣", message: "'await' must precede 'throws'", fixIts: ["move 'await' in front of 'throws'"]),
         DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code '(MyError)' in array element"),
       ],
-      fixedSource: "[() async throws (MyError) -> Void]()",
-      experimentalFeatures: .typedThrows
+      fixedSource: "[() async throws (MyError) -> Void]()"
     )
     assertParse(
       "[() 1️⃣try(MyError) 2️⃣await 3️⃣-> Void]()",
@@ -2883,44 +2877,36 @@ final class StatementExpressionTests: ParserTestCase {
           fixIts: ["insert expression"]
         ),
       ],
-      fixedSource: "[(), try(MyError), await <#expression#> -> Void]()",
-      experimentalFeatures: .typedThrows
+      fixedSource: "[(), try(MyError), await <#expression#> -> Void]()"
     )
     assertParse(
       "[() 1️⃣try await(MyError) -> Void]()",
       diagnostics: [DiagnosticSpec(message: "expected ',' in array element", fixIts: ["insert ','"])],
-      fixedSource: "[(), try await(MyError) -> Void]()",
-      experimentalFeatures: .typedThrows
+      fixedSource: "[(), try await(MyError) -> Void]()"
     )
     assertParse(
       "[() 1️⃣async(MyError) -> Void]()",
       diagnostics: [DiagnosticSpec(message: "expected ',' in array element", fixIts: ["insert ','"])],
-      fixedSource: "[(), async(MyError) -> Void]()",
-      experimentalFeatures: .typedThrows
+      fixedSource: "[(), async(MyError) -> Void]()"
     )
     assertParse(
       "[() 1️⃣await(MyError) -> Void]()",
       diagnostics: [DiagnosticSpec(message: "expected ',' in array element", fixIts: ["insert ','"])],
-      fixedSource: "[(), await(MyError) -> Void]()",
-      experimentalFeatures: .typedThrows
+      fixedSource: "[(), await(MyError) -> Void]()"
     )
     assertParse(
       "[() 1️⃣try(MyError) -> Void]()",
       diagnostics: [DiagnosticSpec(message: "expected ',' in array element", fixIts: ["insert ','"])],
-      fixedSource: "[(), try(MyError) -> Void]()",
-      experimentalFeatures: .typedThrows
+      fixedSource: "[(), try(MyError) -> Void]()"
     )
     assertParse(
-      "[() throws(MyError) -> Void]()",
-      experimentalFeatures: .typedThrows
+      "[() throws(MyError) -> Void]()"
     )
     assertParse(
-      "X<() throws(MyError) -> Int>()",
-      experimentalFeatures: .typedThrows
+      "X<() throws(MyError) -> Int>()"
     )
     assertParse(
-      "X<() async throws(MyError) -> Int>()",
-      experimentalFeatures: .typedThrows
+      "X<() async throws(MyError) -> Int>()"
     )
   }
 

Tests/SwiftParserTest/StatementTests.swift

@@ -902,26 +902,23 @@ final class StatementTests: ParserTestCase {
       do throws(any Error) {
         throw myError
       }
-      """,
-      experimentalFeatures: [.typedThrows]
+      """
     )
 
     assertParse(
       """
       do throws(MyError) {
         throw myError
       }
-      """,
-      experimentalFeatures: [.typedThrows]
+      """
     )
 
     assertParse(
       """
       do throws {
         throw myError
       }
-      """,
-      experimentalFeatures: [.typedThrows]
+      """
     )
   }
 }