Merge pull request #2978 from DougGregor/se-0458-enable-by-default

DougGregor · web-flow · commit 60b01b773502 · 2025-02-26T15:59:53.000-08:00
[SE-0458] Enable `unsafe` expressions and for..in effects everywhere
diff --git a/CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift b/CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift
@@ -183,7 +183,6 @@ public let EXPR_NODES: [Node] = [
   Node(
     kind: .unsafeExpr,
     base: .expr,
-    experimentalFeature: .unsafeExpression,
     nameForDiagnostics: "'unsafe' expression",
     children: [
       Child(
diff --git a/CodeGeneration/Sources/SyntaxSupport/StmtNodes.swift b/CodeGeneration/Sources/SyntaxSupport/StmtNodes.swift
@@ -287,7 +287,6 @@ public let STMT_NODES: [Node] = [
       Child(
         name: "unsafeKeyword",
         kind: .token(choices: [.keyword(.unsafe)]),
-        experimentalFeature: .unsafeExpression,
         isOptional: true
       ),
       Child(
diff --git a/Sources/SwiftParser/Expressions.swift b/Sources/SwiftParser/Expressions.swift
@@ -445,6 +445,10 @@ extension Parser {
         )
       )
     case (.unsafe, let handle)?:
+      if self.peek().isAtStartOfLine || self.peek(isAt: .rightParen) {
+        break EXPR_PREFIX
+      }
+
       let unsafeTok = self.eat(handle)
       let sub = self.parseSequenceExpressionElement(
         flavor: flavor,
diff --git a/Sources/SwiftParser/TokenSpecSet.swift b/Sources/SwiftParser/TokenSpecSet.swift
@@ -714,7 +714,7 @@ enum ExpressionModifierKeyword: TokenSpecSet {
     case TokenSpec(.repeat): self = .repeat
     case TokenSpec(.each): self = .each
     case TokenSpec(.any): self = .any
-    case TokenSpec(.unsafe) where experimentalFeatures.contains(.unsafeExpression): self = .unsafe
+    case TokenSpec(.unsafe): self = .unsafe
     default: return nil
     }
   }
diff --git a/Sources/SwiftSyntax/Documentation.docc/generated/SwiftSyntax.md b/Sources/SwiftSyntax/Documentation.docc/generated/SwiftSyntax.md
@@ -135,6 +135,7 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/UnresolvedAsExprSyntax>
 - <doc:SwiftSyntax/UnresolvedIsExprSyntax>
 - <doc:SwiftSyntax/UnresolvedTernaryExprSyntax>
+- <doc:SwiftSyntax/UnsafeExprSyntax>
 
 ### Patterns
 
diff --git a/Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift b/Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift
@@ -2294,12 +2294,10 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
     visitAnyPost(node._syntaxNode)
   }
 
-  @_spi(ExperimentalLanguageFeatures)
   override open func visit(_ node: UnsafeExprSyntax) -> SyntaxVisitorContinueKind {
     return visitAny(node._syntaxNode)
   }
 
-  @_spi(ExperimentalLanguageFeatures)
   override open func visitPost(_ node: UnsafeExprSyntax) {
     visitAnyPost(node._syntaxNode)
   }
diff --git a/Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift b/Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift
@@ -506,6 +506,7 @@ extension Syntax {
 /// - ``UnresolvedAsExprSyntax``
 /// - ``UnresolvedIsExprSyntax``
 /// - ``UnresolvedTernaryExprSyntax``
+/// - ``UnsafeExprSyntax``
 public struct ExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
 
diff --git a/Sources/SwiftSyntax/generated/SyntaxEnum.swift b/Sources/SwiftSyntax/generated/SyntaxEnum.swift
@@ -303,7 +303,6 @@ public enum SyntaxEnum: Sendable {
   case unresolvedAsExpr(UnresolvedAsExprSyntax)
   case unresolvedIsExpr(UnresolvedIsExprSyntax)
   case unresolvedTernaryExpr(UnresolvedTernaryExprSyntax)
-  @_spi(ExperimentalLanguageFeatures)
   case unsafeExpr(UnsafeExprSyntax)
   case valueBindingPattern(ValueBindingPatternSyntax)
   case variableDecl(VariableDeclSyntax)
@@ -1051,7 +1050,6 @@ public enum ExprSyntaxEnum {
   case unresolvedAsExpr(UnresolvedAsExprSyntax)
   case unresolvedIsExpr(UnresolvedIsExprSyntax)
   case unresolvedTernaryExpr(UnresolvedTernaryExprSyntax)
-  @_spi(ExperimentalLanguageFeatures)
   case unsafeExpr(UnsafeExprSyntax)
 }
 
diff --git a/Sources/SwiftSyntax/generated/SyntaxKind.swift b/Sources/SwiftSyntax/generated/SyntaxKind.swift
@@ -303,7 +303,6 @@ public enum SyntaxKind: Sendable {
   case unresolvedAsExpr
   case unresolvedIsExpr
   case unresolvedTernaryExpr
-  @_spi(ExperimentalLanguageFeatures)
   case unsafeExpr
   case valueBindingPattern
   case variableDecl
diff --git a/Sources/SwiftSyntax/generated/SyntaxRewriter.swift b/Sources/SwiftSyntax/generated/SyntaxRewriter.swift
@@ -2048,10 +2048,9 @@ open class SyntaxRewriter {
     return ExprSyntax(UnresolvedTernaryExprSyntax(unsafeCasting: visitChildren(node._syntaxNode)))
   }
 
-  /// Visit a `UnsafeExprSyntax`.
+  /// Visit a ``UnsafeExprSyntax``.
   ///   - Parameter node: the node that is being visited
   ///   - Returns: the rewritten node
-  @_spi(ExperimentalLanguageFeatures)
   open func visit(_ node: UnsafeExprSyntax) -> ExprSyntax {
     return ExprSyntax(UnsafeExprSyntax(unsafeCasting: visitChildren(node._syntaxNode)))
   }
diff --git a/Sources/SwiftSyntax/generated/SyntaxVisitor.swift b/Sources/SwiftSyntax/generated/SyntaxVisitor.swift
@@ -3380,17 +3380,15 @@ open class SyntaxVisitor {
   open func visitPost(_ node: UnresolvedTernaryExprSyntax) {
   }
 
-  /// Visiting `UnsafeExprSyntax` specifically.
+  /// Visiting ``UnsafeExprSyntax`` specifically.
   ///   - Parameter node: the node we are visiting.
   ///   - Returns: how should we continue visiting.
-  @_spi(ExperimentalLanguageFeatures)
   open func visit(_ node: UnsafeExprSyntax) -> SyntaxVisitorContinueKind {
     return .visitChildren
   }
 
-  /// The function called after visiting `UnsafeExprSyntax` and its descendants.
+  /// The function called after visiting ``UnsafeExprSyntax`` and its descendants.
   ///   - node: the node we just finished visiting.
-  @_spi(ExperimentalLanguageFeatures)
   open func visitPost(_ node: UnsafeExprSyntax) {
   }
 
diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesTUVWXYZ.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesTUVWXYZ.swift
@@ -1951,7 +1951,6 @@ public struct RawUnresolvedTernaryExprSyntax: RawExprSyntaxNodeProtocol {
   }
 }
 
-@_spi(ExperimentalLanguageFeatures)
 @_spi(RawSyntax)
 public struct RawUnsafeExprSyntax: RawExprSyntaxNodeProtocol {
   @_spi(RawSyntax)
diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesEF.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesEF.swift
@@ -2841,7 +2841,6 @@ public struct ForStmtSyntax: StmtSyntaxProtocol, SyntaxHashable, _LeafStmtSyntax
     }
   }
 
-  @_spi(ExperimentalLanguageFeatures)
   public var unexpectedBetweenAwaitKeywordAndUnsafeKeyword: UnexpectedNodesSyntax? {
     get {
       return Syntax(self).child(at: 6)?.cast(UnexpectedNodesSyntax.self)
@@ -2854,7 +2853,6 @@ public struct ForStmtSyntax: StmtSyntaxProtocol, SyntaxHashable, _LeafStmtSyntax
   /// ### Tokens
   /// 
   /// For syntax trees generated by the parser, this is guaranteed to be `unsafe`.
-  @_spi(ExperimentalLanguageFeatures)
   public var unsafeKeyword: TokenSyntax? {
     get {
       return Syntax(self).child(at: 7)?.cast(TokenSyntax.self)
@@ -2864,7 +2862,6 @@ public struct ForStmtSyntax: StmtSyntaxProtocol, SyntaxHashable, _LeafStmtSyntax
     }
   }
 
-  @_spi(ExperimentalLanguageFeatures)
   public var unexpectedBetweenUnsafeKeywordAndCaseKeyword: UnexpectedNodesSyntax? {
     get {
       return Syntax(self).child(at: 8)?.cast(UnexpectedNodesSyntax.self)
diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesTUVWXYZ.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesTUVWXYZ.swift
@@ -3272,13 +3272,10 @@ public struct UnresolvedTernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable, _
 
 // MARK: - UnsafeExprSyntax
 
-/// - Note: Requires experimental feature `unsafeExpression`.
-///
 /// ### Children
 /// 
 ///  - `unsafeKeyword`: `unsafe`
 ///  - `expression`: ``ExprSyntax``
-@_spi(ExperimentalLanguageFeatures)
 public struct UnsafeExprSyntax: ExprSyntaxProtocol, SyntaxHashable, _LeafExprSyntaxNodeProtocol {
   public let _syntaxNode: Syntax
 
diff --git a/Tests/SwiftParserTest/ExpressionTests.swift b/Tests/SwiftParserTest/ExpressionTests.swift
@@ -2194,31 +2194,17 @@ final class StatementExpressionTests: ParserTestCase {
       func f() {
         let x = unsafe y
       }
-      """,
-      experimentalFeatures: .unsafeExpression
+      """
     )
 
     assertParse(
       """
       func f() {
-        let x = unsafe1️⃣ y
+        let x = unsafe
+        y
       }
       """,
-      diagnostics: [
-        DiagnosticSpec(
-          message: "consecutive statements on a line must be separated by newline or ';'",
-          fixIts: [
-            "insert newline",
-            "insert ';'",
-          ]
-        )
-      ],
-      fixedSource: """
-        func f() {
-          let x = unsafe
-          y
-        }
-        """
+      substructure: DeclReferenceExprSyntax(baseName: .identifier("unsafe"))
     )
   }
 
diff --git a/Tests/SwiftParserTest/StatementTests.swift b/Tests/SwiftParserTest/StatementTests.swift
@@ -960,23 +960,19 @@ final class StatementTests: ParserTestCase {
 
   func testForUnsafeStatement() {
     assertParse(
-      "for try await unsafe x in e { }",
-      experimentalFeatures: [.unsafeExpression]
+      "for try await unsafe x in e { }"
     )
 
     assertParse(
-      "for try await unsafe in e { }",
-      experimentalFeatures: [.unsafeExpression]
+      "for try await unsafe in e { }"
     )
 
     assertParse(
-      "for unsafe in e { }",
-      experimentalFeatures: [.unsafeExpression]
+      "for unsafe in e { }"
     )
 
     assertParse(
-      "for unsafe: Int in e { }",
-      experimentalFeatures: [.unsafeExpression]
+      "for unsafe: Int in e { }"
     )
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -445,6 +445,10 @@ extension Parser {`
`445`	`445`	`)`
`446`	`446`	`)`
`447`	`447`	`case (.unsafe, let handle)?:`
	`448`	`+ if self.peek().isAtStartOfLine \|\| self.peek(isAt: .rightParen) {`
	`449`	`+ break EXPR_PREFIX`
	`450`	`+ }`
	`451`	`+`
`448`	`452`	`let unsafeTok = self.eat(handle)`
`449`	`453`	`let sub = self.parseSequenceExpressionElement(`
`450`	`454`	`flavor: flavor,`
Original file line number	Diff line number	Diff line change
`@@ -714,7 +714,7 @@ enum ExpressionModifierKeyword: TokenSpecSet {`
`714`	`714`	`case TokenSpec(.repeat): self = .repeat`
`715`	`715`	`case TokenSpec(.each): self = .each`
`716`	`716`	`case TokenSpec(.any): self = .any`
`717`		`- case TokenSpec(.unsafe) where experimentalFeatures.contains(.unsafeExpression): self = .unsafe`
	`717`	`+ case TokenSpec(.unsafe): self = .unsafe`
`718`	`718`	`default: return nil`
`719`	`719`	`}`
`720`	`720`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2294,12 +2294,10 @@ open class SyntaxAnyVisitor: SyntaxVisitor {`
`2294`	`2294`	`visitAnyPost(node._syntaxNode)`
`2295`	`2295`	`}`
`2296`	`2296`
`2297`		`- @_spi(ExperimentalLanguageFeatures)`
`2298`	`2297`	`override open func visit(_ node: UnsafeExprSyntax) -> SyntaxVisitorContinueKind {`
`2299`	`2298`	`return visitAny(node._syntaxNode)`
`2300`	`2299`	`}`
`2301`	`2300`
`2302`		`- @_spi(ExperimentalLanguageFeatures)`
`2303`	`2301`	`override open func visitPost(_ node: UnsafeExprSyntax) {`
`2304`	`2302`	`visitAnyPost(node._syntaxNode)`
`2305`	`2303`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2048,10 +2048,9 @@ open class SyntaxRewriter {`
`2048`	`2048`	`return ExprSyntax(UnresolvedTernaryExprSyntax(unsafeCasting: visitChildren(node._syntaxNode)))`
`2049`	`2049`	`}`
`2050`	`2050`
`2051`		- /// Visit a `UnsafeExprSyntax`.
	`2051`	+ /// Visit a ``UnsafeExprSyntax``.
`2052`	`2052`	`/// - Parameter node: the node that is being visited`
`2053`	`2053`	`/// - Returns: the rewritten node`
`2054`		`- @_spi(ExperimentalLanguageFeatures)`
`2055`	`2054`	`open func visit(_ node: UnsafeExprSyntax) -> ExprSyntax {`
`2056`	`2055`	`return ExprSyntax(UnsafeExprSyntax(unsafeCasting: visitChildren(node._syntaxNode)))`
`2057`	`2056`	`}`