Skip to content

Commit f0c746c

Browse files
authored
Merge pull request #2052 from ahoppen/ahoppen/key-path-property-compatibility
Improve compatibility layer for `KeyPathPropertyComponentSyntax`
2 parents 3eb344c + 2cf0860 commit f0c746c

File tree

3 files changed

+22
-56
lines changed

3 files changed

+22
-56
lines changed

CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1090,7 +1090,6 @@ public let EXPR_NODES: [Node] = [
10901090
children: [
10911091
Child(
10921092
name: "DeclName",
1093-
deprecatedName: "Identifier",
10941093
kind: .node(kind: .declReferenceExpr)
10951094
),
10961095
Child(

Sources/SwiftSyntax/SwiftSyntaxCompatibility.swift

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,28 @@ extension GenericRequirementSyntax {
7070
@available(*, deprecated, renamed: "NamedDeclSyntax")
7171
public typealias IdentifiedDeclSyntax = NamedDeclSyntax
7272

73+
extension KeyPathPropertyComponentSyntax {
74+
@available(*, deprecated, renamed: "declName.baseName")
75+
public var identifier: TokenSyntax {
76+
get {
77+
return declName.baseName
78+
}
79+
set {
80+
declName.baseName = newValue
81+
}
82+
}
83+
84+
@available(*, deprecated, renamed: "declName.argumentNames")
85+
public var declNameArguments: DeclNameArgumentsSyntax? {
86+
get {
87+
return declName.argumentNames
88+
}
89+
set {
90+
declName.argumentNames = newValue
91+
}
92+
}
93+
}
94+
7395
extension NamedDeclSyntax {
7496
@available(*, deprecated, renamed: "name")
7597
public var identifier: TokenSyntax {

Sources/SwiftSyntax/generated/RenamedChildrenCompatibility.swift

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -4404,61 +4404,6 @@ extension IsExprSyntax {
44044404
}
44054405
}
44064406

4407-
extension KeyPathPropertyComponentSyntax {
4408-
@available(*, deprecated, renamed: "unexpectedBeforeDeclName")
4409-
public var unexpectedBeforeIdentifier: UnexpectedNodesSyntax? {
4410-
get {
4411-
return unexpectedBeforeDeclName
4412-
}
4413-
set {
4414-
unexpectedBeforeDeclName = newValue
4415-
}
4416-
}
4417-
4418-
@available(*, deprecated, renamed: "declName")
4419-
public var identifier: DeclReferenceExprSyntax {
4420-
get {
4421-
return declName
4422-
}
4423-
set {
4424-
declName = newValue
4425-
}
4426-
}
4427-
4428-
@available(*, deprecated, renamed: "unexpectedBetweenDeclNameAndGenericArgumentClause")
4429-
public var unexpectedBetweenIdentifierAndGenericArgumentClause: UnexpectedNodesSyntax? {
4430-
get {
4431-
return unexpectedBetweenDeclNameAndGenericArgumentClause
4432-
}
4433-
set {
4434-
unexpectedBetweenDeclNameAndGenericArgumentClause = newValue
4435-
}
4436-
}
4437-
4438-
@available(*, deprecated, renamed: "KeyPathPropertyComponentSyntax(leadingTrivia:_:declName:_:genericArgumentClause:_:trailingTrivia:)")
4439-
@_disfavoredOverload
4440-
public init(
4441-
leadingTrivia: Trivia? = nil,
4442-
_ unexpectedBeforeIdentifier: UnexpectedNodesSyntax? = nil,
4443-
identifier: DeclReferenceExprSyntax,
4444-
_ unexpectedBetweenIdentifierAndGenericArgumentClause: UnexpectedNodesSyntax? = nil,
4445-
genericArgumentClause: GenericArgumentClauseSyntax? = nil,
4446-
_ unexpectedAfterGenericArgumentClause: UnexpectedNodesSyntax? = nil,
4447-
trailingTrivia: Trivia? = nil
4448-
4449-
) {
4450-
self.init(
4451-
leadingTrivia: leadingTrivia,
4452-
unexpectedBeforeIdentifier,
4453-
declName: identifier,
4454-
unexpectedBetweenIdentifierAndGenericArgumentClause,
4455-
genericArgumentClause: genericArgumentClause,
4456-
unexpectedAfterGenericArgumentClause,
4457-
trailingTrivia: trailingTrivia
4458-
)
4459-
}
4460-
}
4461-
44624407
extension KeyPathSubscriptComponentSyntax {
44634408
@available(*, deprecated, renamed: "unexpectedBeforeLeftSquare")
44644409
public var unexpectedBeforeLeftBracket: UnexpectedNodesSyntax? {

0 commit comments

Comments
 (0)