Skip to content

Commit aed5f54

Browse files
committed
Rename elementList in TupleExprSyntax to elements
1 parent b2000e7 commit aed5f54

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
786786
override func visit(_ node: TupleExprSyntax) -> SyntaxVisitorContinueKind {
787787
// We'll do nothing if it's a zero-element tuple, because we just want to keep the empty `()`
788788
// together.
789-
let elementCount = node.elementList.count
789+
let elementCount = node.elements.count
790790

791791
if elementCount == 1 {
792792
// A tuple with one element is a parenthesized expression; add a group around it to keep it
@@ -808,9 +808,9 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
808808
after(node.leftParen, tokens: .break(.open, size: 0), .open)
809809
before(node.rightParen, tokens: .break(.close, size: 0), .close)
810810

811-
insertTokens(.break(.same), betweenElementsOf: node.elementList)
811+
insertTokens(.break(.same), betweenElementsOf: node.elements)
812812

813-
for element in node.elementList {
813+
for element in node.elements {
814814
arrangeAsTupleExprElement(element)
815815
}
816816
}
@@ -3261,8 +3261,8 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
32613261
return true
32623262
case .tryExpr(let tryExpr):
32633263
return isCompoundExpression(tryExpr.expression)
3264-
case .tupleExpr(let tupleExpr) where tupleExpr.elementList.count == 1:
3265-
return isCompoundExpression(tupleExpr.elementList.first!.expression)
3264+
case .tupleExpr(let tupleExpr) where tupleExpr.elements.count == 1:
3265+
return isCompoundExpression(tupleExpr.elements.first!.expression)
32663266
default:
32673267
return false
32683268
}
@@ -3296,7 +3296,7 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
32963296
/// not parenthesized.
32973297
private func parenthesizedLeftmostExpr(of expr: ExprSyntax) -> TupleExprSyntax? {
32983298
switch Syntax(expr).as(SyntaxEnum.self) {
3299-
case .tupleExpr(let tupleExpr) where tupleExpr.elementList.count == 1:
3299+
case .tupleExpr(let tupleExpr) where tupleExpr.elements.count == 1:
33003300
return tupleExpr
33013301
case .infixOperatorExpr(let infixOperatorExpr):
33023302
return parenthesizedLeftmostExpr(of: infixOperatorExpr.leftOperand)
@@ -3442,7 +3442,7 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
34423442
)
34433443
}
34443444

3445-
if let innerExpr = parenthesizedExpr.elementList.first?.expression,
3445+
if let innerExpr = parenthesizedExpr.elements.first?.expression,
34463446
let stringLiteralExpr = innerExpr.as(StringLiteralExprSyntax.self),
34473447
stringLiteralExpr.openQuote.tokenKind == .multilineStringQuote
34483448
{

Sources/SwiftFormatRules/NoParensAroundConditions.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import SwiftSyntax
2727
/// call with a trailing closure.
2828
public final class NoParensAroundConditions: SyntaxFormatRule {
2929
private func extractExpr(_ tuple: TupleExprSyntax) -> ExprSyntax {
30-
assert(tuple.elementList.count == 1)
31-
let expr = tuple.elementList.first!.expression
30+
assert(tuple.elements.count == 1)
31+
let expr = tuple.elements.first!.expression
3232

3333
// If the condition is a function with a trailing closure or if it's an immediately called
3434
// closure, removing the outer set of parentheses introduces a parse ambiguity.
@@ -46,7 +46,7 @@ public final class NoParensAroundConditions: SyntaxFormatRule {
4646

4747
guard
4848
let visitedTuple = visit(tuple).as(TupleExprSyntax.self),
49-
let visitedExpr = visitedTuple.elementList.first?.expression
49+
let visitedExpr = visitedTuple.elements.first?.expression
5050
else {
5151
return expr
5252
}
@@ -71,7 +71,7 @@ public final class NoParensAroundConditions: SyntaxFormatRule {
7171

7272
public override func visit(_ node: ConditionElementSyntax) -> ConditionElementSyntax {
7373
guard let tup = node.condition.as(TupleExprSyntax.self),
74-
tup.elementList.firstAndOnly != nil
74+
tup.elements.firstAndOnly != nil
7575
else {
7676
return super.visit(node)
7777
}
@@ -81,7 +81,7 @@ public final class NoParensAroundConditions: SyntaxFormatRule {
8181
/// FIXME(hbh): Parsing for SwitchExprSyntax is not implemented.
8282
public override func visit(_ node: SwitchExprSyntax) -> ExprSyntax {
8383
guard let tup = node.expression.as(TupleExprSyntax.self),
84-
tup.elementList.firstAndOnly != nil
84+
tup.elements.firstAndOnly != nil
8585
else {
8686
return super.visit(node)
8787
}
@@ -91,7 +91,7 @@ public final class NoParensAroundConditions: SyntaxFormatRule {
9191

9292
public override func visit(_ node: RepeatWhileStmtSyntax) -> StmtSyntax {
9393
guard let tup = node.condition.as(TupleExprSyntax.self),
94-
tup.elementList.firstAndOnly != nil
94+
tup.elements.firstAndOnly != nil
9595
else {
9696
return super.visit(node)
9797
}

Sources/SwiftFormatRules/UseShorthandTypeNames.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
335335
let tupleExprElementList = TupleExprElementListSyntax([tupleExprElement])
336336
let tupleExpr = TupleExprSyntax(
337337
leftParen: TokenSyntax.leftParenToken(leadingTrivia: leadingTrivia ?? []),
338-
elementList: tupleExprElementList,
338+
elements: tupleExprElementList,
339339
rightParen: TokenSyntax.rightParenToken())
340340
wrappedTypeExpr = ExprSyntax(tupleExpr)
341341
} else {
@@ -429,7 +429,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
429429
guard let elementExprs = expressionRepresentation(of: tupleType.elements) else { return nil }
430430
let result = TupleExprSyntax(
431431
leftParen: tupleType.leftParen,
432-
elementList: elementExprs,
432+
elements: elementExprs,
433433
rightParen: tupleType.rightParen)
434434
return ExprSyntax(result)
435435

@@ -473,7 +473,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
473473

474474
let tupleExpr = TupleExprSyntax(
475475
leftParen: leftParen,
476-
elementList: argumentTypeExprs,
476+
elements: argumentTypeExprs,
477477
rightParen: rightParen)
478478
let arrowExpr = ArrowExprSyntax(
479479
effectSpecifiers: effectSpecifiers,

0 commit comments

Comments
 (0)