Merge pull request #1952 from ahoppen/ahoppen/remove-init-effects

Remove nodes for accessor init effects

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

@@ -65,76 +65,6 @@ public let DECL_NODES: [Node] = [
     ]
   ),
 
-  Node(
-    kind: .accessesEffect,
-    base: .syntax,
-    nameForDiagnostics: "accesses effect",
-    children: [
-      Child(
-        name: "AccessesKeyword",
-        kind: .token(choices: [.keyword(text: "accesses")])
-      ),
-      Child(
-        name: "LeftParen",
-        kind: .token(choices: [.token(tokenKind: "LeftParenToken")])
-      ),
-      Child(
-        name: "Properties",
-        deprecatedName: "PropertyList",
-        kind: .collection(kind: .labeledExprList, collectionElementName: "Property"),
-        nameForDiagnostics: "properties"
-      ),
-      Child(
-        name: "RightParen",
-        kind: .token(choices: [.token(tokenKind: "RightParenToken")])
-      ),
-    ]
-  ),
-
-  Node(
-    kind: .initializesEffect,
-    base: .syntax,
-    nameForDiagnostics: "initializes effect",
-    children: [
-      Child(
-        name: "InitializesKeyword",
-        kind: .token(choices: [.keyword(text: "initializes")])
-      ),
-      Child(
-        name: "LeftParen",
-        kind: .token(choices: [.token(tokenKind: "LeftParenToken")])
-      ),
-      Child(
-        name: "Properties",
-        deprecatedName: "PropertyList",
-        kind: .collection(kind: .labeledExprList, collectionElementName: "Property"),
-        nameForDiagnostics: "properties"
-      ),
-      Child(
-        name: "RightParen",
-        kind: .token(choices: [.token(tokenKind: "RightParenToken")])
-      ),
-    ]
-  ),
-
-  Node(
-    kind: .accessorInitEffects,
-    base: .syntax,
-    nameForDiagnostics: "init accessor effects",
-    children: [
-      Child(
-        name: "InitializesEffect",
-        kind: .node(kind: .initializesEffect),
-        isOptional: true
-      ),
-      Child(
-        name: "AccessesEffect",
-        kind: .node(kind: .accessesEffect),
-        isOptional: true
-      ),
-    ]
-  ),
-
   Node(
     kind: .accessorDecl,
     base: .decl,
@@ -185,11 +115,6 @@ public let DECL_NODES: [Node] = [
         kind: .node(kind: .accessorEffectSpecifiers),
         isOptional: true
       ),
-      Child(
-        name: "InitEffects",
-        kind: .node(kind: .accessorInitEffects),
-        isOptional: true
-      ),
       Child(
         name: "Body",
         kind: .node(kind: .codeBlock),

CodeGeneration/Sources/SyntaxSupport/SyntaxNodeKind.swift

@@ -20,12 +20,10 @@ import SwiftSyntaxBuilder
 public enum SyntaxNodeKind: String, CaseIterable {
   // Please keep this list sorted alphabetically
 
-  case accessesEffect
   case accessorBlock
   case accessorDecl
   case accessorDeclList
   case accessorEffectSpecifiers
-  case accessorInitEffects
   case accessorParameters
   case actorDecl
   case arrayElement
@@ -169,7 +167,6 @@ public enum SyntaxNodeKind: String, CaseIterable {
   case inheritedTypeList
   case initializerClause
   case initializerDecl
-  case initializesEffect
   case inOutExpr
   case integerLiteralExpr
   case isExpr

CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift

@@ -524,7 +524,6 @@ class ValidateSyntaxNodes: XCTestCase {
     assertFailuresMatchXFails(
       failures,
       expectedFailures: [
-        ValidationFailure(node: .accessesEffect, message: "could conform to trait 'Parenthesized' but does not"),
         ValidationFailure(node: .accessorParameters, message: "could conform to trait 'NamedDecl' but does not"),
         ValidationFailure(node: .availabilityCondition, message: "could conform to trait 'Parenthesized' but does not"),
         ValidationFailure(node: .canImportExpr, message: "could conform to trait 'Parenthesized' but does not"),
@@ -533,7 +532,6 @@ class ValidateSyntaxNodes: XCTestCase {
         ValidationFailure(node: .editorPlaceholderExpr, message: "could conform to trait 'MissingNode' but does not"),
         ValidationFailure(node: .enumCaseElement, message: "could conform to trait 'NamedDecl' but does not"),
         ValidationFailure(node: .genericParameter, message: "could conform to trait 'NamedDecl' but does not"),
-        ValidationFailure(node: .initializesEffect, message: "could conform to trait 'Parenthesized' but does not"),
         ValidationFailure(node: .precedenceGroupDecl, message: "could conform to trait 'Braced' but does not"),
         ValidationFailure(node: .precedenceGroupName, message: "could conform to trait 'NamedDecl' but does not"),
         ValidationFailure(node: .primaryAssociatedType, message: "could conform to trait 'NamedDecl' but does not"),

Sources/SwiftParser/Declarations.swift

@@ -1378,7 +1378,6 @@ extension Parser {
     }
 
     let effectSpecifiers = self.parseAccessorEffectSpecifiers()
-    let initEffects = self.parseInitAccessorEffects()
 
     let body = self.parseOptionalCodeBlock()
     return RawAccessorDeclSyntax(
@@ -1388,7 +1387,6 @@ extension Parser {
       accessorSpecifier: introducer.token,
       parameters: parameters,
       effectSpecifiers: effectSpecifiers,
-      initEffects: initEffects,
       body: body,
       arena: self.arena
     )

Sources/SwiftParser/Specifiers.swift

@@ -756,74 +756,3 @@ extension Parser {
     return RawUnexpectedNodesSyntax(unexpected, arena: self.arena)
   }
 }
-
-// MARK: - Parsing `initializes` and `accesses` specifiers in init accessors
-
-extension Parser {
-  mutating func parseInitAccessorEffects() -> RawAccessorInitEffectsSyntax? {
-    let initializes = self.parseInitializesSpecifier()
-    let accesses = self.parseAccessesSpecifier()
-
-    if initializes == nil, accesses == nil {
-      return nil
-    }
-
-    return RawAccessorInitEffectsSyntax(
-      initializesEffect: initializes,
-      accessesEffect: accesses,
-      arena: self.arena
-    )
-  }
-
-  mutating func parseInitializesSpecifier() -> RawInitializesEffectSyntax? {
-    guard let keyword = self.consume(if: .keyword(.initializes)) else {
-      return nil
-    }
-
-    let (unexpectedBeforeLeftParen, leftParen) = self.expect(.leftParen)
-
-    let args = parseArgumentListElements(pattern: .none)
-    let argumentList = RawLabeledExprListSyntax(
-      elements: args,
-      arena: self.arena
-    )
-
-    let (unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)
-
-    return RawInitializesEffectSyntax(
-      initializesKeyword: keyword,
-      unexpectedBeforeLeftParen,
-      leftParen: leftParen,
-      properties: argumentList,
-      unexpectedBeforeRightParen,
-      rightParen: rightParen,
-      arena: self.arena
-    )
-  }
-
-  mutating func parseAccessesSpecifier() -> RawAccessesEffectSyntax? {
-    guard let keyword = self.consume(if: .keyword(.accesses)) else {
-      return nil
-    }
-
-    let (unexpectedBeforeLeftParen, leftParen) = self.expect(.leftParen)
-
-    let args = parseArgumentListElements(pattern: .none)
-    let argumentList = RawLabeledExprListSyntax(
-      elements: args,
-      arena: self.arena
-    )
-
-    let (unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)
-
-    return RawAccessesEffectSyntax(
-      accessesKeyword: keyword,
-      unexpectedBeforeLeftParen,
-      leftParen: leftParen,
-      properties: argumentList,
-      unexpectedBeforeRightParen,
-      rightParen: rightParen,
-      arena: self.arena
-    )
-  }
-}

Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift

@@ -16,8 +16,6 @@ import SwiftSyntax
 
 private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
   switch keyPath {
-  case \AccessesEffectSyntax.properties:
-    return "properties"
   case \AccessorDeclSyntax.attributes:
     return "attributes"
   case \AccessorDeclSyntax.modifier:
@@ -206,8 +204,6 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
     return "function signature"
   case \InitializerDeclSyntax.genericWhereClause:
     return "generic where clause"
-  case \InitializesEffectSyntax.properties:
-    return "properties"
   case \KeyPathExprSyntax.root:
     return "root"
   case \KeyPathSubscriptComponentSyntax.arguments:

Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift

@@ -19,14 +19,10 @@ extension SyntaxKind {
     switch self {
     case .token:
       return "token"
-    case .accessesEffect:
-      return "accesses effect"
     case .accessorDecl:
       return "accessor"
     case .accessorEffectSpecifiers:
       return "accessor specifiers"
-    case .accessorInitEffects:
-      return "init accessor effects"
     case .actorDecl:
       return "actor"
     case .arrayElement:
@@ -229,8 +225,6 @@ extension SyntaxKind {
       return "inherited type"
     case .initializerDecl:
       return "initializer"
-    case .initializesEffect:
-      return "initializes effect"
     case .integerLiteralExpr:
       return "integer literal"
     case .isExpr:

Sources/SwiftSyntax/Documentation.docc/generated/SwiftSyntax.md

@@ -305,10 +305,8 @@ These articles are intended for developers wishing to contribute to SwiftSyntax
 
 ### Miscellaneous Syntax
 
-- <doc:SwiftSyntax/AccessesEffectSyntax>
 - <doc:SwiftSyntax/AccessorBlockSyntax>
 - <doc:SwiftSyntax/AccessorEffectSpecifiersSyntax>
-- <doc:SwiftSyntax/AccessorInitEffectsSyntax>
 - <doc:SwiftSyntax/AccessorParametersSyntax>
 - <doc:SwiftSyntax/AvailabilityConditionSyntax>
 - <doc:SwiftSyntax/AvailabilityLabeledArgumentSyntax>
@@ -340,7 +338,6 @@ These articles are intended for developers wishing to contribute to SwiftSyntax
 - <doc:SwiftSyntax/ImplementsAttributeArgumentsSyntax>
 - <doc:SwiftSyntax/InheritanceClauseSyntax>
 - <doc:SwiftSyntax/InitializerClauseSyntax>
-- <doc:SwiftSyntax/InitializesEffectSyntax>
 - <doc:SwiftSyntax/KeyPathOptionalComponentSyntax>
 - <doc:SwiftSyntax/KeyPathPropertyComponentSyntax>
 - <doc:SwiftSyntax/KeyPathSubscriptComponentSyntax>

Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

@@ -17,24 +17,6 @@
 @_spi(RawSyntax)
 public func childName(_ keyPath: AnyKeyPath) -> String? {
   switch keyPath {
-  case \AccessesEffectSyntax.unexpectedBeforeAccessesKeyword:
-    return "unexpectedBeforeAccessesKeyword"
-  case \AccessesEffectSyntax.accessesKeyword:
-    return "accessesKeyword"
-  case \AccessesEffectSyntax.unexpectedBetweenAccessesKeywordAndLeftParen:
-    return "unexpectedBetweenAccessesKeywordAndLeftParen"
-  case \AccessesEffectSyntax.leftParen:
-    return "leftParen"
-  case \AccessesEffectSyntax.unexpectedBetweenLeftParenAndProperties:
-    return "unexpectedBetweenLeftParenAndProperties"
-  case \AccessesEffectSyntax.properties:
-    return "properties"
-  case \AccessesEffectSyntax.unexpectedBetweenPropertiesAndRightParen:
-    return "unexpectedBetweenPropertiesAndRightParen"
-  case \AccessesEffectSyntax.rightParen:
-    return "rightParen"
-  case \AccessesEffectSyntax.unexpectedAfterRightParen:
-    return "unexpectedAfterRightParen"
   case \AccessorBlockSyntax.unexpectedBeforeLeftBrace:
     return "unexpectedBeforeLeftBrace"
   case \AccessorBlockSyntax.leftBrace:
@@ -69,12 +51,8 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBetweenParametersAndEffectSpecifiers"
   case \AccessorDeclSyntax.effectSpecifiers:
     return "effectSpecifiers"
-  case \AccessorDeclSyntax.unexpectedBetweenEffectSpecifiersAndInitEffects:
-    return "unexpectedBetweenEffectSpecifiersAndInitEffects"
-  case \AccessorDeclSyntax.initEffects:
-    return "initEffects"
-  case \AccessorDeclSyntax.unexpectedBetweenInitEffectsAndBody:
-    return "unexpectedBetweenInitEffectsAndBody"
+  case \AccessorDeclSyntax.unexpectedBetweenEffectSpecifiersAndBody:
+    return "unexpectedBetweenEffectSpecifiersAndBody"
   case \AccessorDeclSyntax.body:
     return "body"
   case \AccessorDeclSyntax.unexpectedAfterBody:
@@ -89,16 +67,6 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "throwsSpecifier"
   case \AccessorEffectSpecifiersSyntax.unexpectedAfterThrowsSpecifier:
     return "unexpectedAfterThrowsSpecifier"
-  case \AccessorInitEffectsSyntax.unexpectedBeforeInitializesEffect:
-    return "unexpectedBeforeInitializesEffect"
-  case \AccessorInitEffectsSyntax.initializesEffect:
-    return "initializesEffect"
-  case \AccessorInitEffectsSyntax.unexpectedBetweenInitializesEffectAndAccessesEffect:
-    return "unexpectedBetweenInitializesEffectAndAccessesEffect"
-  case \AccessorInitEffectsSyntax.accessesEffect:
-    return "accessesEffect"
-  case \AccessorInitEffectsSyntax.unexpectedAfterAccessesEffect:
-    return "unexpectedAfterAccessesEffect"
   case \AccessorParametersSyntax.unexpectedBeforeLeftParen:
     return "unexpectedBeforeLeftParen"
   case \AccessorParametersSyntax.leftParen:
@@ -1859,24 +1827,6 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "body"
   case \InitializerDeclSyntax.unexpectedAfterBody:
     return "unexpectedAfterBody"
-  case \InitializesEffectSyntax.unexpectedBeforeInitializesKeyword:
-    return "unexpectedBeforeInitializesKeyword"
-  case \InitializesEffectSyntax.initializesKeyword:
-    return "initializesKeyword"
-  case \InitializesEffectSyntax.unexpectedBetweenInitializesKeywordAndLeftParen:
-    return "unexpectedBetweenInitializesKeywordAndLeftParen"
-  case \InitializesEffectSyntax.leftParen:
-    return "leftParen"
-  case \InitializesEffectSyntax.unexpectedBetweenLeftParenAndProperties:
-    return "unexpectedBetweenLeftParenAndProperties"
-  case \InitializesEffectSyntax.properties:
-    return "properties"
-  case \InitializesEffectSyntax.unexpectedBetweenPropertiesAndRightParen:
-    return "unexpectedBetweenPropertiesAndRightParen"
-  case \InitializesEffectSyntax.rightParen:
-    return "rightParen"
-  case \InitializesEffectSyntax.unexpectedAfterRightParen:
-    return "unexpectedAfterRightParen"
   case \IntegerLiteralExprSyntax.unexpectedBeforeLiteral:
     return "unexpectedBeforeLiteral"
   case \IntegerLiteralExprSyntax.literal: