Skip to content

Commit 68cd96e

Browse files
committed
Apply changes to new UnresolvedTernaryExprSyntax
1 parent 7b72402 commit 68cd96e

File tree

4 files changed

+24
-20
lines changed

4 files changed

+24
-20
lines changed

Sources/SwiftSyntax/Raw/gyb_generated/RawSyntaxNodes.swift

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2618,6 +2618,10 @@ public struct RawBooleanLiteralExprSyntax: RawExprSyntaxNodeProtocol {
26182618

26192619
@_spi(RawSyntax)
26202620
public struct RawUnresolvedTernaryExprSyntax: RawExprSyntaxNodeProtocol {
2621+
var layoutView: RawSyntaxLayoutView {
2622+
return raw.layoutView!
2623+
}
2624+
26212625
public static func isKindOf(_ raw: RawSyntax) -> Bool {
26222626
return raw.kind == .unresolvedTernaryExpr
26232627
}
@@ -2656,22 +2660,22 @@ public struct RawUnresolvedTernaryExprSyntax: RawExprSyntaxNodeProtocol {
26562660
}
26572661

26582662
public var unexpectedBeforeQuestionMark: RawUnexpectedNodesSyntax? {
2659-
raw.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
2663+
layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
26602664
}
26612665
public var questionMark: RawTokenSyntax {
2662-
raw.children[1].map(RawTokenSyntax.init(raw:))!
2666+
layoutView.children[1].map(RawTokenSyntax.init(raw:))!
26632667
}
26642668
public var unexpectedBetweenQuestionMarkAndFirstChoice: RawUnexpectedNodesSyntax? {
2665-
raw.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
2669+
layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
26662670
}
26672671
public var firstChoice: RawExprSyntax {
2668-
raw.children[3].map(RawExprSyntax.init(raw:))!
2672+
layoutView.children[3].map(RawExprSyntax.init(raw:))!
26692673
}
26702674
public var unexpectedBetweenFirstChoiceAndColonMark: RawUnexpectedNodesSyntax? {
2671-
raw.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
2675+
layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
26722676
}
26732677
public var colonMark: RawTokenSyntax {
2674-
raw.children[5].map(RawTokenSyntax.init(raw:))!
2678+
layoutView.children[5].map(RawTokenSyntax.init(raw:))!
26752679
}
26762680
}
26772681

Sources/SwiftSyntax/gyb_generated/SyntaxFactory.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,23 +1154,23 @@ public enum SyntaxFactory {
11541154
unexpectedBetweenFirstChoiceAndColonMark?.raw,
11551155
colonMark.raw,
11561156
]
1157-
let raw = RawSyntax.createAndCalcLength(kind: SyntaxKind.unresolvedTernaryExpr,
1158-
layout: layout, presence: SourcePresence.present)
1157+
let raw = RawSyntax.makeLayout(kind: SyntaxKind.unresolvedTernaryExpr,
1158+
from: layout, arena: .default)
11591159
let data = SyntaxData.forRoot(raw)
11601160
return UnresolvedTernaryExprSyntax(data)
11611161
}
11621162

11631163
@available(*, deprecated, message: "Use initializer on UnresolvedTernaryExprSyntax")
11641164
public static func makeBlankUnresolvedTernaryExpr(presence: SourcePresence = .present) -> UnresolvedTernaryExprSyntax {
1165-
let data = SyntaxData.forRoot(RawSyntax.create(kind: .unresolvedTernaryExpr,
1166-
layout: [
1165+
let data = SyntaxData.forRoot(RawSyntax.makeLayout(kind: .unresolvedTernaryExpr,
1166+
from: [
11671167
nil,
1168-
RawSyntax.missingToken(TokenKind.infixQuestionMark),
1168+
RawSyntax.makeMissingToken(kind: TokenKind.infixQuestionMark, arena: .default),
11691169
nil,
1170-
RawSyntax.missing(SyntaxKind.missingExpr),
1170+
RawSyntax.makeEmptyLayout(kind: SyntaxKind.missingExpr, arena: .default),
11711171
nil,
1172-
RawSyntax.missingToken(TokenKind.colon),
1173-
], length: .zero, presence: presence))
1172+
RawSyntax.makeMissingToken(kind: TokenKind.colon, arena: .default),
1173+
], arena: .default))
11741174
return UnresolvedTernaryExprSyntax(data)
11751175
}
11761176
@available(*, deprecated, message: "Use initializer on TernaryExprSyntax")

Sources/SwiftSyntax/gyb_generated/SyntaxVisitor.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3328,7 +3328,7 @@ open class SyntaxVisitor {
33283328
let node = UnresolvedTernaryExprSyntax(data)
33293329
let needsChildren = (visit(node) == .visitChildren)
33303330
// Avoid calling into visitChildren if possible.
3331-
if needsChildren && node.raw.numberOfChildren > 0 {
3331+
if needsChildren && !node.raw.layoutView!.children.isEmpty {
33323332
visitChildren(node)
33333333
}
33343334
visitPost(node)

Sources/SwiftSyntax/gyb_generated/syntax_nodes/SyntaxExprNodes.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3813,8 +3813,8 @@ public struct UnresolvedTernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
38133813
unexpectedBetweenFirstChoiceAndColonMark?.raw,
38143814
colonMark.raw,
38153815
]
3816-
let raw = RawSyntax.createAndCalcLength(kind: SyntaxKind.unresolvedTernaryExpr,
3817-
layout: layout, presence: SourcePresence.present)
3816+
let raw = RawSyntax.makeLayout(kind: SyntaxKind.unresolvedTernaryExpr,
3817+
from: layout, arena: .default)
38183818
let data = SyntaxData.forRoot(raw)
38193819
self.init(data)
38203820
}
@@ -3861,7 +3861,7 @@ public struct UnresolvedTernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
38613861
/// current `questionMark`, if present.
38623862
public func withQuestionMark(
38633863
_ newChild: TokenSyntax?) -> UnresolvedTernaryExprSyntax {
3864-
let raw = newChild?.raw ?? RawSyntax.missingToken(TokenKind.infixQuestionMark)
3864+
let raw = newChild?.raw ?? RawSyntax.makeMissingToken(kind: TokenKind.infixQuestionMark, arena: .default)
38653865
let newData = data.replacingChild(raw, at: Cursor.questionMark)
38663866
return UnresolvedTernaryExprSyntax(newData)
38673867
}
@@ -3904,7 +3904,7 @@ public struct UnresolvedTernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
39043904
/// current `firstChoice`, if present.
39053905
public func withFirstChoice(
39063906
_ newChild: ExprSyntax?) -> UnresolvedTernaryExprSyntax {
3907-
let raw = newChild?.raw ?? RawSyntax.missing(SyntaxKind.missingExpr)
3907+
let raw = newChild?.raw ?? RawSyntax.makeEmptyLayout(kind: SyntaxKind.missingExpr, arena: .default)
39083908
let newData = data.replacingChild(raw, at: Cursor.firstChoice)
39093909
return UnresolvedTernaryExprSyntax(newData)
39103910
}
@@ -3947,7 +3947,7 @@ public struct UnresolvedTernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
39473947
/// current `colonMark`, if present.
39483948
public func withColonMark(
39493949
_ newChild: TokenSyntax?) -> UnresolvedTernaryExprSyntax {
3950-
let raw = newChild?.raw ?? RawSyntax.missingToken(TokenKind.colon)
3950+
let raw = newChild?.raw ?? RawSyntax.makeMissingToken(kind: TokenKind.colon, arena: .default)
39513951
let newData = data.replacingChild(raw, at: Cursor.colonMark)
39523952
return UnresolvedTernaryExprSyntax(newData)
39533953
}

0 commit comments

Comments
 (0)