Skip to content

Commit d54a829

Browse files
ahoppenahoppen
committed
A couple more renames of SwiftSyntax nodes
1 parent 1cd6c22 commit d54a829

File tree

12 files changed

+112
-55
lines changed

12 files changed

+112
-55
lines changed

‎CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@ public let ATTRIBUTE_NODES: [Node] = [
190190
traits: ["WithTrailingComma"],
191191
children: [
192192
Child(
193-
name: "AvailabilityVersionRestriction",
193+
name: "PlatformVersion",
194+
deprecatedName: "AvailabilityVersionRestriction",
194195
kind: .node(kind: .platformVersion)
195196
),
196197
Child(

‎CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1384,8 +1384,7 @@ public let EXPR_NODES: [Node] = [
13841384
Child(
13851385
name: "Operator",
13861386
deprecatedName: "OperatorToken",
1387-
kind: .token(choices: [.token(tokenKind: "PrefixOperatorToken")]),
1388-
isOptional: true
1387+
kind: .token(choices: [.token(tokenKind: "PrefixOperatorToken")])
13891388
),
13901389
Child(
13911390
name: "Expression",

‎Sources/SwiftIDEUtils/SyntaxClassification.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ extension SyntaxClassification {
6565
switch keyPath {
6666
case \AttributeSyntax.attributeName:
6767
return (.attribute, true)
68-
case \PlatformVersionItemSyntax.availabilityVersionRestriction:
68+
case \PlatformVersionItemSyntax.platformVersion:
6969
return (.keyword, false)
7070
case \AvailabilityVersionRestrictionSyntax.platform:
7171
return (.keyword, false)

‎Sources/SwiftParser/Attributes.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,7 @@ extension Parser {
914914
keepGoing = self.consume(if: .comma)
915915
elements.append(
916916
RawPlatformVersionItemSyntax(
917-
availabilityVersionRestriction: versionRestriction,
917+
platformVersion: versionRestriction,
918918
trailingComma: keepGoing,
919919
arena: self.arena
920920
)
@@ -974,7 +974,7 @@ extension Parser {
974974
keepGoing = self.consume(if: .comma)
975975
platforms.append(
976976
RawPlatformVersionItemSyntax(
977-
availabilityVersionRestriction: restriction,
977+
platformVersion: restriction,
978978
trailingComma: keepGoing,
979979
arena: self.arena
980980
)

‎Sources/SwiftParser/IncrementalParseTransition.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ extension Parser {
3535
}
3636
}
3737

38-
/// Accepts a re-used ``Syntax`` node that `IncrementalParseTransition`
38+
/// Accepts a re-used `Syntax` node that `IncrementalParseTransition`
3939
/// determined they should be re-used for a parse invocation.
4040
///
4141
/// The client can use this information to potentially avoid unnecessary work

‎Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,8 +1043,7 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
10431043
addDiagnostic(unexpected, UnknownDirectiveError(unexpected: unexpected), handledNodes: [unexpected.id, node.baseName.id])
10441044
} else if let availability = unexpected.first?.as(AvailabilityConditionSyntax.self) {
10451045
if let prefixOperatorExpr = node.parent?.as(PrefixOperatorExprSyntax.self),
1046-
let operatorToken = prefixOperatorExpr.operator,
1047-
operatorToken.text == "!",
1046+
prefixOperatorExpr.operator.text == "!",
10481047
let conditionElement = prefixOperatorExpr.parent?.as(ConditionElementSyntax.self)
10491048
{
10501049
// Diagnose !#available(...) and !#unavailable(...)
@@ -1059,7 +1058,10 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
10591058
NegatedAvailabilityCondition(availabilityCondition: availability, negatedAvailabilityKeyword: negatedAvailabilityKeyword),
10601059
fixIts: [
10611060
FixIt(
1062-
message: ReplaceTokensFixIt(replaceTokens: [operatorToken, availability.availabilityKeyword], replacements: [negatedAvailabilityKeyword]),
1061+
message: ReplaceTokensFixIt(
1062+
replaceTokens: [prefixOperatorExpr.operator, availability.availabilityKeyword],
1063+
replacements: [negatedAvailabilityKeyword]
1064+
),
10631065
changes: [
10641066
.replace(oldNode: Syntax(conditionElement), newNode: Syntax(negatedConditionElement))
10651067
]

‎Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2437,12 +2437,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
24372437
return "pattern"
24382438
case \PatternExprSyntax.unexpectedAfterPattern:
24392439
return "unexpectedAfterPattern"
2440-
case \PlatformVersionItemSyntax.unexpectedBeforeAvailabilityVersionRestriction:
2441-
return "unexpectedBeforeAvailabilityVersionRestriction"
2442-
case \PlatformVersionItemSyntax.availabilityVersionRestriction:
2443-
return "availabilityVersionRestriction"
2444-
case \PlatformVersionItemSyntax.unexpectedBetweenAvailabilityVersionRestrictionAndTrailingComma:
2445-
return "unexpectedBetweenAvailabilityVersionRestrictionAndTrailingComma"
2440+
case \PlatformVersionItemSyntax.unexpectedBeforePlatformVersion:
2441+
return "unexpectedBeforePlatformVersion"
2442+
case \PlatformVersionItemSyntax.platformVersion:
2443+
return "platformVersion"
2444+
case \PlatformVersionItemSyntax.unexpectedBetweenPlatformVersionAndTrailingComma:
2445+
return "unexpectedBetweenPlatformVersionAndTrailingComma"
24462446
case \PlatformVersionItemSyntax.trailingComma:
24472447
return "trailingComma"
24482448
case \PlatformVersionItemSyntax.unexpectedAfterTrailingComma:

‎Sources/SwiftSyntax/generated/RenamedChildrenCompatibility.swift

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5767,6 +5767,61 @@ extension PatternBindingSyntax {
57675767
}
57685768
}
57695769

5770+
extension PlatformVersionItemSyntax {
5771+
@available(*, deprecated, renamed: "unexpectedBeforePlatformVersion")
5772+
public var unexpectedBeforeAvailabilityVersionRestriction: UnexpectedNodesSyntax? {
5773+
get {
5774+
return unexpectedBeforePlatformVersion
5775+
}
5776+
set {
5777+
unexpectedBeforePlatformVersion = newValue
5778+
}
5779+
}
5780+
5781+
@available(*, deprecated, renamed: "platformVersion")
5782+
public var availabilityVersionRestriction: PlatformVersionSyntax {
5783+
get {
5784+
return platformVersion
5785+
}
5786+
set {
5787+
platformVersion = newValue
5788+
}
5789+
}
5790+
5791+
@available(*, deprecated, renamed: "unexpectedBetweenPlatformVersionAndTrailingComma")
5792+
public var unexpectedBetweenAvailabilityVersionRestrictionAndTrailingComma: UnexpectedNodesSyntax? {
5793+
get {
5794+
return unexpectedBetweenPlatformVersionAndTrailingComma
5795+
}
5796+
set {
5797+
unexpectedBetweenPlatformVersionAndTrailingComma = newValue
5798+
}
5799+
}
5800+
5801+
@available(*, deprecated, renamed: "PlatformVersionItemSyntax(leadingTrivia:_:platformVersion:_:trailingComma:_:trailingTrivia:)")
5802+
@_disfavoredOverload
5803+
public init(
5804+
leadingTrivia: Trivia? = nil,
5805+
_ unexpectedBeforeAvailabilityVersionRestriction: UnexpectedNodesSyntax? = nil,
5806+
availabilityVersionRestriction: PlatformVersionSyntax,
5807+
_ unexpectedBetweenAvailabilityVersionRestrictionAndTrailingComma: UnexpectedNodesSyntax? = nil,
5808+
trailingComma: TokenSyntax? = nil,
5809+
_ unexpectedAfterTrailingComma: UnexpectedNodesSyntax? = nil,
5810+
trailingTrivia: Trivia? = nil
5811+
5812+
) {
5813+
self.init(
5814+
leadingTrivia: leadingTrivia,
5815+
unexpectedBeforeAvailabilityVersionRestriction,
5816+
platformVersion: availabilityVersionRestriction,
5817+
unexpectedBetweenAvailabilityVersionRestrictionAndTrailingComma,
5818+
trailingComma: trailingComma,
5819+
unexpectedAfterTrailingComma,
5820+
trailingTrivia: trailingTrivia
5821+
)
5822+
}
5823+
}
5824+
57705825
extension PostfixOperatorExprSyntax {
57715826
@available(*, deprecated, renamed: "unexpectedBetweenExpressionAndOperator")
57725827
public var unexpectedBetweenExpressionAndOperatorToken: UnexpectedNodesSyntax? {
@@ -6354,7 +6409,7 @@ extension PrefixOperatorExprSyntax {
63546409
}
63556410

63566411
@available(*, deprecated, renamed: "operator")
6357-
public var operatorToken: TokenSyntax? {
6412+
public var operatorToken: TokenSyntax {
63586413
get {
63596414
return `operator`
63606415
}
@@ -6398,7 +6453,7 @@ extension PrefixOperatorExprSyntax {
63986453
public init(
63996454
leadingTrivia: Trivia? = nil,
64006455
_ unexpectedBeforeOperatorToken: UnexpectedNodesSyntax? = nil,
6401-
operatorToken: TokenSyntax? = nil,
6456+
operatorToken: TokenSyntax,
64026457
_ unexpectedBetweenOperatorTokenAndPostfixExpression: UnexpectedNodesSyntax? = nil,
64036458
postfixExpression: some ExprSyntaxProtocol,
64046459
_ unexpectedAfterPostfixExpression: UnexpectedNodesSyntax? = nil,

‎Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16273,34 +16273,34 @@ public struct RawPlatformVersionItemSyntax: RawSyntaxNodeProtocol {
1627316273
}
1627416274

1627516275
public init(
16276-
_ unexpectedBeforeAvailabilityVersionRestriction: RawUnexpectedNodesSyntax? = nil,
16277-
availabilityVersionRestriction: RawPlatformVersionSyntax,
16278-
_ unexpectedBetweenAvailabilityVersionRestrictionAndTrailingComma: RawUnexpectedNodesSyntax? = nil,
16276+
_ unexpectedBeforePlatformVersion: RawUnexpectedNodesSyntax? = nil,
16277+
platformVersion: RawPlatformVersionSyntax,
16278+
_ unexpectedBetweenPlatformVersionAndTrailingComma: RawUnexpectedNodesSyntax? = nil,
1627916279
trailingComma: RawTokenSyntax?,
1628016280
_ unexpectedAfterTrailingComma: RawUnexpectedNodesSyntax? = nil,
1628116281
arena: __shared SyntaxArena
1628216282
) {
1628316283
let raw = RawSyntax.makeLayout(
1628416284
kind: .platformVersionItem, uninitializedCount: 5, arena: arena) { layout in
1628516285
layout.initialize(repeating: nil)
16286-
layout[0] = unexpectedBeforeAvailabilityVersionRestriction?.raw
16287-
layout[1] = availabilityVersionRestriction.raw
16288-
layout[2] = unexpectedBetweenAvailabilityVersionRestrictionAndTrailingComma?.raw
16286+
layout[0] = unexpectedBeforePlatformVersion?.raw
16287+
layout[1] = platformVersion.raw
16288+
layout[2] = unexpectedBetweenPlatformVersionAndTrailingComma?.raw
1628916289
layout[3] = trailingComma?.raw
1629016290
layout[4] = unexpectedAfterTrailingComma?.raw
1629116291
}
1629216292
self.init(unchecked: raw)
1629316293
}
1629416294

16295-
public var unexpectedBeforeAvailabilityVersionRestriction: RawUnexpectedNodesSyntax? {
16295+
public var unexpectedBeforePlatformVersion: RawUnexpectedNodesSyntax? {
1629616296
layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
1629716297
}
1629816298

16299-
public var availabilityVersionRestriction: RawPlatformVersionSyntax {
16299+
public var platformVersion: RawPlatformVersionSyntax {
1630016300
layoutView.children[1].map(RawPlatformVersionSyntax.init(raw:))!
1630116301
}
1630216302

16303-
public var unexpectedBetweenAvailabilityVersionRestrictionAndTrailingComma: RawUnexpectedNodesSyntax? {
16303+
public var unexpectedBetweenPlatformVersionAndTrailingComma: RawUnexpectedNodesSyntax? {
1630416304
layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
1630516305
}
1630616306

@@ -17361,7 +17361,7 @@ public struct RawPrefixOperatorExprSyntax: RawExprSyntaxNodeProtocol {
1736117361

1736217362
public init(
1736317363
_ unexpectedBeforeOperator: RawUnexpectedNodesSyntax? = nil,
17364-
operator: RawTokenSyntax?,
17364+
operator: RawTokenSyntax,
1736517365
_ unexpectedBetweenOperatorAndExpression: RawUnexpectedNodesSyntax? = nil,
1736617366
expression: RawExprSyntax,
1736717367
_ unexpectedAfterExpression: RawUnexpectedNodesSyntax? = nil,
@@ -17371,7 +17371,7 @@ public struct RawPrefixOperatorExprSyntax: RawExprSyntaxNodeProtocol {
1737117371
kind: .prefixOperatorExpr, uninitializedCount: 5, arena: arena) { layout in
1737217372
layout.initialize(repeating: nil)
1737317373
layout[0] = unexpectedBeforeOperator?.raw
17374-
layout[1] = `operator`?.raw
17374+
layout[1] = `operator`.raw
1737517375
layout[2] = unexpectedBetweenOperatorAndExpression?.raw
1737617376
layout[3] = expression.raw
1737717377
layout[4] = unexpectedAfterExpression?.raw
@@ -17383,8 +17383,8 @@ public struct RawPrefixOperatorExprSyntax: RawExprSyntaxNodeProtocol {
1738317383
layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
1738417384
}
1738517385

17386-
public var `operator`: RawTokenSyntax? {
17387-
layoutView.children[1].map(RawTokenSyntax.init(raw:))
17386+
public var `operator`: RawTokenSyntax {
17387+
layoutView.children[1].map(RawTokenSyntax.init(raw:))!
1738817388
}
1738917389

1739017390
public var unexpectedBetweenOperatorAndExpression: RawUnexpectedNodesSyntax? {

‎Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2122,7 +2122,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
21222122
case .prefixOperatorExpr:
21232123
assert(layout.count == 5)
21242124
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
2125-
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax?.self, tokenChoices: [.tokenKind(.prefixOperator)]))
2125+
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [.tokenKind(.prefixOperator)]))
21262126
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
21272127
assertNoError(kind, 3, verify(layout[3], as: RawExprSyntax.self))
21282128
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))

0 commit comments

Comments
 (0)