Skip to content

Commit 3f03ee1

Browse files
kimdvkimdv
committed
Rename TupleExprSyntax.elementList to TupleExprSyntax.elements
This is to be more consistent in namings
1 parent 56ef324 commit 3f03ee1

File tree

12 files changed

+111
-47
lines changed

12 files changed

+111
-47
lines changed

‎CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1762,7 +1762,7 @@ public let EXPR_NODES: [Node] = [
17621762
kind: .token(choices: [.token(tokenKind: "LeftParenToken")])
17631763
),
17641764
Child(
1765-
name: "ElementList",
1765+
name: "Elements",
17661766
kind: .collection(kind: .tupleExprElementList, collectionElementName: "Element"),
17671767
isIndented: true
17681768
),

‎Sources/SwiftBasicFormat/generated/BasicFormat+Extensions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ fileprivate extension AnyKeyPath {
6161
return true
6262
case \SwitchCaseSyntax.statements:
6363
return true
64-
case \TupleExprSyntax.elementList:
64+
case \TupleExprSyntax.elements:
6565
return true
6666
case \TupleTypeSyntax.elements:
6767
return true

‎Sources/SwiftParser/Expressions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1576,7 +1576,7 @@ extension Parser {
15761576
return RawTupleExprSyntax(
15771577
unexpectedBeforeLParen,
15781578
leftParen: lparen,
1579-
elementList: RawTupleExprElementListSyntax(elements: elements, arena: self.arena),
1579+
elements: RawTupleExprElementListSyntax(elements: elements, arena: self.arena),
15801580
unexpectedBeforeRParen,
15811581
rightParen: rparen,
15821582
arena: self.arena

‎Sources/SwiftSyntax/SwiftSyntaxCompatibility.swift

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,38 @@ public extension NamedOpaqueReturnTypeSyntax {
116116
)
117117
}
118118
}
119+
120+
extension TupleExprSyntax {
121+
@available(*, deprecated, renamed: "unexpectedBetweenLeftParenAndElements")
122+
public var unexpectedBetweenLeftParenAndElementList: UnexpectedNodesSyntax? { unexpectedBetweenLeftParenAndElements }
123+
124+
@available(*, deprecated, renamed: "elements")
125+
public var elementList: TupleExprElementListSyntax { elements }
126+
127+
@available(*, deprecated, renamed: "unexpectedBetweenElementsAndRightParen")
128+
public var unexpectedBetweenElementListAndRightParen: UnexpectedNodesSyntax? { unexpectedBetweenElementsAndRightParen }
129+
130+
@available(*, deprecated, message: "Use an initializer with a elements argument")
131+
public init(
132+
leadingTrivia: Trivia? = nil,
133+
_ unexpectedBeforeLeftParen: UnexpectedNodesSyntax? = nil,
134+
leftParen: TokenSyntax = .leftParenToken(),
135+
_ unexpectedBetweenLeftParenAndElementList: UnexpectedNodesSyntax? = nil,
136+
elementList: TupleExprElementListSyntax,
137+
_ unexpectedBetweenElementListAndRightParen: UnexpectedNodesSyntax? = nil,
138+
rightParen: TokenSyntax = .rightParenToken(),
139+
_ unexpectedAfterRightParen: UnexpectedNodesSyntax? = nil,
140+
trailingTrivia: Trivia? = nil
141+
142+
) {
143+
self.init(leadingTrivia: leadingTrivia,
144+
unexpectedBeforeLeftParen,
145+
leftParen: leftParen,
146+
unexpectedBetweenLeftParenAndElementList,
147+
elements: elementList,
148+
unexpectedBetweenElementListAndRightParen,
149+
rightParen: rightParen,
150+
unexpectedAfterRightParen,
151+
trailingTrivia: trailingTrivia)
152+
}
153+
}

‎Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3083,12 +3083,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
30833083
return "unexpectedBeforeLeftParen"
30843084
case \TupleExprSyntax.leftParen:
30853085
return "leftParen"
3086-
case \TupleExprSyntax.unexpectedBetweenLeftParenAndElementList:
3087-
return "unexpectedBetweenLeftParenAndElementList"
3088-
case \TupleExprSyntax.elementList:
3089-
return "elementList"
3090-
case \TupleExprSyntax.unexpectedBetweenElementListAndRightParen:
3091-
return "unexpectedBetweenElementListAndRightParen"
3086+
case \TupleExprSyntax.unexpectedBetweenLeftParenAndElements:
3087+
return "unexpectedBetweenLeftParenAndElements"
3088+
case \TupleExprSyntax.elements:
3089+
return "elements"
3090+
case \TupleExprSyntax.unexpectedBetweenElementsAndRightParen:
3091+
return "unexpectedBetweenElementsAndRightParen"
30923092
case \TupleExprSyntax.rightParen:
30933093
return "rightParen"
30943094
case \TupleExprSyntax.unexpectedAfterRightParen:

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20351,9 +20351,9 @@ public struct RawTupleExprSyntax: RawExprSyntaxNodeProtocol {
2035120351
public init(
2035220352
_ unexpectedBeforeLeftParen: RawUnexpectedNodesSyntax? = nil,
2035320353
leftParen: RawTokenSyntax,
20354-
_ unexpectedBetweenLeftParenAndElementList: RawUnexpectedNodesSyntax? = nil,
20355-
elementList: RawTupleExprElementListSyntax,
20356-
_ unexpectedBetweenElementListAndRightParen: RawUnexpectedNodesSyntax? = nil,
20354+
_ unexpectedBetweenLeftParenAndElements: RawUnexpectedNodesSyntax? = nil,
20355+
elements: RawTupleExprElementListSyntax,
20356+
_ unexpectedBetweenElementsAndRightParen: RawUnexpectedNodesSyntax? = nil,
2035720357
rightParen: RawTokenSyntax,
2035820358
_ unexpectedAfterRightParen: RawUnexpectedNodesSyntax? = nil,
2035920359
arena: __shared SyntaxArena
@@ -20363,9 +20363,9 @@ public struct RawTupleExprSyntax: RawExprSyntaxNodeProtocol {
2036320363
layout.initialize(repeating: nil)
2036420364
layout[0] = unexpectedBeforeLeftParen?.raw
2036520365
layout[1] = leftParen.raw
20366-
layout[2] = unexpectedBetweenLeftParenAndElementList?.raw
20367-
layout[3] = elementList.raw
20368-
layout[4] = unexpectedBetweenElementListAndRightParen?.raw
20366+
layout[2] = unexpectedBetweenLeftParenAndElements?.raw
20367+
layout[3] = elements.raw
20368+
layout[4] = unexpectedBetweenElementsAndRightParen?.raw
2036920369
layout[5] = rightParen.raw
2037020370
layout[6] = unexpectedAfterRightParen?.raw
2037120371
}
@@ -20380,15 +20380,15 @@ public struct RawTupleExprSyntax: RawExprSyntaxNodeProtocol {
2038020380
layoutView.children[1].map(RawTokenSyntax.init(raw:))!
2038120381
}
2038220382

20383-
public var unexpectedBetweenLeftParenAndElementList: RawUnexpectedNodesSyntax? {
20383+
public var unexpectedBetweenLeftParenAndElements: RawUnexpectedNodesSyntax? {
2038420384
layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
2038520385
}
2038620386

20387-
public var elementList: RawTupleExprElementListSyntax {
20387+
public var elements: RawTupleExprElementListSyntax {
2038820388
layoutView.children[3].map(RawTupleExprElementListSyntax.init(raw:))!
2038920389
}
2039020390

20391-
public var unexpectedBetweenElementListAndRightParen: RawUnexpectedNodesSyntax? {
20391+
public var unexpectedBetweenElementsAndRightParen: RawUnexpectedNodesSyntax? {
2039220392
layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
2039320393
}
2039420394

‎Sources/SwiftSyntax/generated/syntaxNodes/SyntaxExprNodes.swift

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6377,9 +6377,9 @@ public struct TupleExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
63776377
leadingTrivia: Trivia? = nil,
63786378
_ unexpectedBeforeLeftParen: UnexpectedNodesSyntax? = nil,
63796379
leftParen: TokenSyntax = .leftParenToken(),
6380-
_ unexpectedBetweenLeftParenAndElementList: UnexpectedNodesSyntax? = nil,
6381-
elementList: TupleExprElementListSyntax,
6382-
_ unexpectedBetweenElementListAndRightParen: UnexpectedNodesSyntax? = nil,
6380+
_ unexpectedBetweenLeftParenAndElements: UnexpectedNodesSyntax? = nil,
6381+
elements: TupleExprElementListSyntax,
6382+
_ unexpectedBetweenElementsAndRightParen: UnexpectedNodesSyntax? = nil,
63836383
rightParen: TokenSyntax = .rightParenToken(),
63846384
_ unexpectedAfterRightParen: UnexpectedNodesSyntax? = nil,
63856385
trailingTrivia: Trivia? = nil
@@ -6390,18 +6390,18 @@ public struct TupleExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
63906390
let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
63916391
unexpectedBeforeLeftParen,
63926392
leftParen,
6393-
unexpectedBetweenLeftParenAndElementList,
6394-
elementList,
6395-
unexpectedBetweenElementListAndRightParen,
6393+
unexpectedBetweenLeftParenAndElements,
6394+
elements,
6395+
unexpectedBetweenElementsAndRightParen,
63966396
rightParen,
63976397
unexpectedAfterRightParen
63986398
))) {(arena, _) in
63996399
let layout: [RawSyntax?] = [
64006400
unexpectedBeforeLeftParen?.raw,
64016401
leftParen.raw,
6402-
unexpectedBetweenLeftParenAndElementList?.raw,
6403-
elementList.raw,
6404-
unexpectedBetweenElementListAndRightParen?.raw,
6402+
unexpectedBetweenLeftParenAndElements?.raw,
6403+
elements.raw,
6404+
unexpectedBetweenElementsAndRightParen?.raw,
64056405
rightParen.raw,
64066406
unexpectedAfterRightParen?.raw
64076407
]
@@ -6436,7 +6436,7 @@ public struct TupleExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
64366436
}
64376437
}
64386438

6439-
public var unexpectedBetweenLeftParenAndElementList: UnexpectedNodesSyntax? {
6439+
public var unexpectedBetweenLeftParenAndElements: UnexpectedNodesSyntax? {
64406440
get {
64416441
return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
64426442
}
@@ -6445,7 +6445,7 @@ public struct TupleExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
64456445
}
64466446
}
64476447

6448-
public var elementList: TupleExprElementListSyntax {
6448+
public var elements: TupleExprElementListSyntax {
64496449
get {
64506450
return TupleExprElementListSyntax(data.child(at: 3, parent: Syntax(self))!)
64516451
}
@@ -6454,12 +6454,12 @@ public struct TupleExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
64546454
}
64556455
}
64566456

6457-
/// Adds the provided `Element` to the node's `elementList`
6457+
/// Adds the provided `Element` to the node's `elements`
64586458
/// collection.
64596459
/// - param element: The new `Element` to add to the node's
6460-
/// `elementList` collection.
6460+
/// `elements` collection.
64616461
/// - returns: A copy of the receiver with the provided `Element`
6462-
/// appended to its `elementList` collection.
6462+
/// appended to its `elements` collection.
64636463
public func addElement(_ element: TupleExprElementSyntax) -> TupleExprSyntax {
64646464
var collection: RawSyntax
64656465
let arena = SyntaxArena()
@@ -6473,7 +6473,7 @@ public struct TupleExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
64736473
return TupleExprSyntax(newData)
64746474
}
64756475

6476-
public var unexpectedBetweenElementListAndRightParen: UnexpectedNodesSyntax? {
6476+
public var unexpectedBetweenElementsAndRightParen: UnexpectedNodesSyntax? {
64776477
get {
64786478
return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
64796479
}
@@ -6504,9 +6504,9 @@ public struct TupleExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
65046504
return .layout([
65056505
\Self.unexpectedBeforeLeftParen,
65066506
\Self.leftParen,
6507-
\Self.unexpectedBetweenLeftParenAndElementList,
6508-
\Self.elementList,
6509-
\Self.unexpectedBetweenElementListAndRightParen,
6507+
\Self.unexpectedBetweenLeftParenAndElements,
6508+
\Self.elements,
6509+
\Self.unexpectedBetweenElementsAndRightParen,
65106510
\Self.rightParen,
65116511
\Self.unexpectedAfterRightParen
65126512
])

‎Sources/SwiftSyntaxBuilder/SwiftSyntaxBuilderCompatibility.swift

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,34 @@
1313
// This file provides compatiblity aliases to keep dependents of SwiftSyntaxBuilder building.
1414
// All users of the declarations in this file should transition away from them ASAP.
1515

16+
import SwiftSyntax
17+
1618
@available(*, deprecated, renamed: "ImportPathBuilder")
1719
public typealias AccessPathBuilder = ImportPathBuilder
20+
21+
extension TupleExprSyntax {
22+
@available(*, deprecated, message: "Use an initializer with a elements argument")
23+
public init(
24+
leadingTrivia: Trivia? = nil,
25+
unexpectedBeforeLeftParen: UnexpectedNodesSyntax? = nil,
26+
leftParen: TokenSyntax = .leftParenToken(),
27+
unexpectedBetweenLeftParenAndElementList: UnexpectedNodesSyntax? = nil,
28+
unexpectedBetweenElementListAndRightParen: UnexpectedNodesSyntax? = nil,
29+
rightParen: TokenSyntax = .rightParenToken(),
30+
unexpectedAfterRightParen: UnexpectedNodesSyntax? = nil,
31+
@TupleExprElementListBuilder elementListBuilder: () throws -> TupleExprElementListSyntax,
32+
trailingTrivia: Trivia? = nil
33+
) rethrows {
34+
try self.init(
35+
leadingTrivia: leadingTrivia,
36+
unexpectedBeforeLeftParen,
37+
leftParen: leftParen,
38+
unexpectedBetweenLeftParenAndElementList,
39+
elements: elementListBuilder(),
40+
unexpectedBetweenElementListAndRightParen,
41+
rightParen: rightParen,
42+
unexpectedAfterRightParen,
43+
trailingTrivia: trailingTrivia
44+
)
45+
}
46+
}

‎Sources/SwiftSyntaxBuilder/generated/BuildableNodes.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,20 +1350,20 @@ extension TupleExprSyntax {
13501350
leadingTrivia: Trivia? = nil,
13511351
unexpectedBeforeLeftParen: UnexpectedNodesSyntax? = nil,
13521352
leftParen: TokenSyntax = .leftParenToken(),
1353-
unexpectedBetweenLeftParenAndElementList: UnexpectedNodesSyntax? = nil,
1354-
unexpectedBetweenElementListAndRightParen: UnexpectedNodesSyntax? = nil,
1353+
unexpectedBetweenLeftParenAndElements: UnexpectedNodesSyntax? = nil,
1354+
unexpectedBetweenElementsAndRightParen: UnexpectedNodesSyntax? = nil,
13551355
rightParen: TokenSyntax = .rightParenToken(),
13561356
unexpectedAfterRightParen: UnexpectedNodesSyntax? = nil,
1357-
@TupleExprElementListBuilder elementListBuilder: () throws -> TupleExprElementListSyntax,
1357+
@TupleExprElementListBuilder elementsBuilder: () throws -> TupleExprElementListSyntax,
13581358
trailingTrivia: Trivia? = nil
13591359
) rethrows {
13601360
try self.init(
13611361
leadingTrivia: leadingTrivia,
13621362
unexpectedBeforeLeftParen,
13631363
leftParen: leftParen,
1364-
unexpectedBetweenLeftParenAndElementList,
1365-
elementList: elementListBuilder(),
1366-
unexpectedBetweenElementListAndRightParen,
1364+
unexpectedBetweenLeftParenAndElements,
1365+
elements: elementsBuilder(),
1366+
unexpectedBetweenElementsAndRightParen,
13671367
rightParen: rightParen,
13681368
unexpectedAfterRightParen,
13691369
trailingTrivia: trailingTrivia

‎Tests/SwiftOperatorsTest/OperatorTableTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ class ExplicitParenFolder: SyntaxRewriter {
4646
override func visit(_ node: TupleExprSyntax) -> ExprSyntax {
4747
// Identify syntax nodes of the form (x (op) y), which is a
4848
// TupleExprSyntax(SequenceExpr(x, (op), y)).
49-
guard node.elementList.count == 1,
50-
let firstNode = node.elementList.first,
49+
guard node.elements.count == 1,
50+
let firstNode = node.elements.first,
5151
firstNode.label == nil,
5252
let sequenceExpr = firstNode.expression.as(SequenceExprSyntax.self),
5353
sequenceExpr.elements.count == 3,

‎Tests/SwiftParserTest/VariadicGenericsTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ final class VariadicGenericsTests: XCTestCase {
206206
callee: MemberAccessExprSyntax(
207207
base: ExprSyntax(
208208
TupleExprSyntax(
209-
elementList: .init([
209+
elements: .init([
210210
TupleExprElementSyntax(
211211
expression: PackElementExprSyntax(
212212
eachKeyword: .keyword(.each),

‎Tests/SwiftParserTest/translated/ForwardSlashRegexTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,7 +1077,7 @@ final class ForwardSlashRegexTests: XCTestCase {
10771077
TupleExprElementListSyntax([
10781078
.init(
10791079
expression: TupleExprSyntax(
1080-
elementList: .init([
1080+
elements: .init([
10811081
.init(expression: IdentifierExprSyntax(identifier: .binaryOperator("/")))
10821082
])
10831083
),
@@ -1118,7 +1118,7 @@ final class ForwardSlashRegexTests: XCTestCase {
11181118
TupleExprElementListSyntax([
11191119
.init(
11201120
expression: TupleExprSyntax(
1121-
elementList: .init([
1121+
elements: .init([
11221122
.init(expression: IdentifierExprSyntax(identifier: .binaryOperator("/^")))
11231123
])
11241124
),

0 commit comments

Comments
 (0)