Skip to content

Commit b950ac0

Browse files
kimdvkimdv
authored
Merge pull request #1722 from kimdv/kimdv/1720-functiontypesyntaxarguments-should-be-named-parameters
Functiontypesyntaxarguments should be named parameters
2 parents 65ad81a + aacf6b6 commit b950ac0

File tree

9 files changed

+206
-63
lines changed

9 files changed

+206
-63
lines changed

‎CodeGeneration/Sources/SyntaxSupport/TypeNodes.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ public let TYPE_NODES: [Node] = [
183183
kind: .token(choices: [.token(tokenKind: "LeftParenToken")])
184184
),
185185
Child(
186-
name: "Arguments",
187-
kind: .collection(kind: .tupleTypeElementList, collectionElementName: "Argument"),
186+
name: "Parameters",
187+
kind: .collection(kind: .tupleTypeElementList, collectionElementName: "Parameter"),
188188
isIndented: true
189189
),
190190
Child(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fileprivate extension AnyKeyPath {
4444
return true
4545
case \FunctionCallExprSyntax.argumentList:
4646
return true
47-
case \FunctionTypeSyntax.arguments:
47+
case \FunctionTypeSyntax.parameters:
4848
return true
4949
case \MemberDeclBlockSyntax.members:
5050
return true

‎Sources/SwiftParser/Types.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,21 +61,21 @@ extension Parser {
6161
let unexpectedBeforeLeftParen: RawUnexpectedNodesSyntax?
6262
let leftParen: RawTokenSyntax
6363
let unexpectedBetweenLeftParenAndElements: RawUnexpectedNodesSyntax?
64-
let arguments: RawTupleTypeElementListSyntax
64+
let parameters: RawTupleTypeElementListSyntax
6565
let unexpectedBetweenElementsAndRightParen: RawUnexpectedNodesSyntax?
6666
let rightParen: RawTokenSyntax
6767
if let input = base.as(RawTupleTypeSyntax.self) {
6868
unexpectedBeforeLeftParen = input.unexpectedBeforeLeftParen
6969
leftParen = input.leftParen
7070
unexpectedBetweenLeftParenAndElements = input.unexpectedBetweenLeftParenAndElements
71-
arguments = input.elements
71+
parameters = input.elements
7272
unexpectedBetweenElementsAndRightParen = input.unexpectedBetweenElementsAndRightParen
7373
rightParen = input.rightParen
7474
} else {
7575
unexpectedBeforeLeftParen = nil
7676
leftParen = RawTokenSyntax(missing: .leftParen, arena: self.arena)
7777
unexpectedBetweenLeftParenAndElements = nil
78-
arguments = RawTupleTypeElementListSyntax(
78+
parameters = RawTupleTypeElementListSyntax(
7979
elements: [
8080
RawTupleTypeElementSyntax(
8181
inOut: nil,
@@ -100,7 +100,7 @@ extension Parser {
100100
unexpectedBeforeLeftParen,
101101
leftParen: leftParen,
102102
unexpectedBetweenLeftParenAndElements,
103-
arguments: arguments,
103+
parameters: parameters,
104104
unexpectedBetweenElementsAndRightParen,
105105
rightParen: rightParen,
106106
effectSpecifiers: effectSpecifiers,

‎Sources/SwiftSyntax/SwiftSyntaxCompatibility.swift

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

16-
public extension DeclGroupSyntax {
17-
@available(*, deprecated, renamed: "memberBlock")
18-
var members: MemberDeclBlockSyntax {
19-
return self.memberBlock
20-
}
21-
}
22-
2316
@available(*, deprecated, renamed: "ImportPathSyntax")
2417
public typealias AccessPathSyntax = ImportPathSyntax
2518

@@ -29,15 +22,48 @@ public typealias AccessPathComponentSyntax = ImportPathComponentSyntax
2922
@available(*, deprecated, renamed: "WithAttributesSyntax")
3023
public typealias AttributedSyntax = WithAttributesSyntax
3124

25+
public extension DeclGroupSyntax {
26+
@available(*, deprecated, renamed: "memberBlock")
27+
var members: MemberDeclBlockSyntax {
28+
get {
29+
return memberBlock
30+
}
31+
set(value) {
32+
memberBlock = value
33+
}
34+
}
35+
}
36+
3237
public extension EnumDeclSyntax {
3338
@available(*, deprecated, renamed: "unexpectedBetweenIdentifierAndGenericParameterClause")
34-
var unexpectedBetweenIdentifierAndGenericParameters: UnexpectedNodesSyntax? { unexpectedBetweenIdentifierAndGenericParameterClause }
39+
var unexpectedBetweenIdentifierAndGenericParameters: UnexpectedNodesSyntax? {
40+
get {
41+
return unexpectedBetweenIdentifierAndGenericParameterClause
42+
}
43+
set(value) {
44+
unexpectedBetweenIdentifierAndGenericParameterClause = value
45+
}
46+
}
3547

3648
@available(*, deprecated, renamed: "genericParameterClause")
37-
var genericParameters: GenericParameterClauseSyntax? { genericParameterClause }
49+
var genericParameters: GenericParameterClauseSyntax? {
50+
get {
51+
return genericParameterClause
52+
}
53+
set(value) {
54+
genericParameterClause = value
55+
}
56+
}
3857

3958
@available(*, deprecated, renamed: "unexpectedBetweenGenericParameterClauseAndInheritanceClause")
40-
var unexpectedBetweenGenericParametersAndInheritanceClause: UnexpectedNodesSyntax? { unexpectedBetweenGenericParameterClauseAndInheritanceClause }
59+
var unexpectedBetweenGenericParametersAndInheritanceClause: UnexpectedNodesSyntax? {
60+
get {
61+
return unexpectedBetweenGenericParameterClauseAndInheritanceClause
62+
}
63+
set(value) {
64+
unexpectedBetweenGenericParameterClauseAndInheritanceClause = value
65+
}
66+
}
4167

4268
@available(*, deprecated, message: "Use an initializer with a genericParameterClause argument.")
4369
init(
@@ -85,15 +111,111 @@ public extension EnumDeclSyntax {
85111
}
86112
}
87113

114+
public extension FunctionTypeSyntax {
115+
@available(*, deprecated, renamed: "unexpectedBetweenLeftParenAndParameters")
116+
var unexpectedBetweenLeftParenAndArguments: UnexpectedNodesSyntax? {
117+
get {
118+
return unexpectedBetweenLeftParenAndParameters
119+
}
120+
set(value) {
121+
unexpectedBetweenLeftParenAndParameters = value
122+
}
123+
}
124+
125+
@available(*, deprecated, renamed: "parameters")
126+
var arguments: TupleTypeElementListSyntax {
127+
get {
128+
return parameters
129+
}
130+
set(value) {
131+
parameters = value
132+
}
133+
}
134+
135+
@available(*, deprecated, renamed: "unexpectedBetweenParametersAndRightParen")
136+
var unexpectedBetweenArgumentsAndRightParen: UnexpectedNodesSyntax? {
137+
get {
138+
return unexpectedBetweenParametersAndRightParen
139+
}
140+
set(value) {
141+
unexpectedBetweenParametersAndRightParen = value
142+
}
143+
}
144+
145+
/// Adds the provided `element` to the node's `arguments`
146+
/// - param element: The new `Argument` to add to the node's
147+
/// `arguments` collection.
148+
/// - returns: A copy of the receiver with the provided `Argument`
149+
/// appended to its `arguments` collection.
150+
@available(*, deprecated, renamed: "addParameter")
151+
func addArgument(_ element: TupleTypeElementSyntax) -> FunctionTypeSyntax {
152+
return self.addParameter(element)
153+
}
154+
155+
@available(*, deprecated, message: "Use an initializer with a parameters")
156+
init(
157+
leadingTrivia: Trivia? = nil,
158+
_ unexpectedBeforeLeftParen: UnexpectedNodesSyntax? = nil,
159+
leftParen: TokenSyntax = .leftParenToken(),
160+
_ unexpectedBetweenLeftParenAndArguments: UnexpectedNodesSyntax? = nil,
161+
arguments: TupleTypeElementListSyntax,
162+
_ unexpectedBetweenArgumentsAndRightParen: UnexpectedNodesSyntax? = nil,
163+
rightParen: TokenSyntax = .rightParenToken(),
164+
_ unexpectedBetweenRightParenAndEffectSpecifiers: UnexpectedNodesSyntax? = nil,
165+
effectSpecifiers: TypeEffectSpecifiersSyntax? = nil,
166+
_ unexpectedBetweenEffectSpecifiersAndOutput: UnexpectedNodesSyntax? = nil,
167+
output: ReturnClauseSyntax,
168+
_ unexpectedAfterOutput: UnexpectedNodesSyntax? = nil,
169+
trailingTrivia: Trivia? = nil
170+
) {
171+
self.init(
172+
leadingTrivia: leadingTrivia,
173+
unexpectedBeforeLeftParen,
174+
leftParen: leftParen,
175+
unexpectedBetweenLeftParenAndArguments,
176+
parameters: arguments,
177+
unexpectedBetweenArgumentsAndRightParen,
178+
rightParen: rightParen,
179+
unexpectedBetweenRightParenAndEffectSpecifiers,
180+
effectSpecifiers: effectSpecifiers,
181+
unexpectedBetweenEffectSpecifiersAndOutput,
182+
output: output,
183+
unexpectedAfterOutput,
184+
trailingTrivia: trailingTrivia
185+
)
186+
}
187+
}
188+
88189
public extension NamedOpaqueReturnTypeSyntax {
89190
@available(*, deprecated, renamed: "unexpectedBeforeGenericParameterClause")
90-
var unexpectedBeforeGenericParameters: UnexpectedNodesSyntax? { unexpectedBeforeGenericParameterClause }
191+
var unexpectedBeforeGenericParameters: UnexpectedNodesSyntax? {
192+
get {
193+
return unexpectedBeforeGenericParameterClause
194+
}
195+
set(value) {
196+
unexpectedBeforeGenericParameterClause = value
197+
}
198+
}
91199

92200
@available(*, deprecated, renamed: "genericParameterClause")
93-
var genericParameters: GenericParameterClauseSyntax? { genericParameterClause }
201+
var genericParameters: GenericParameterClauseSyntax {
202+
get {
203+
return genericParameterClause
204+
}
205+
set(value) {
206+
genericParameterClause = value
207+
}
208+
}
94209

95210
@available(*, deprecated, renamed: "unexpectedBetweenGenericParameterClauseAndBaseType")
96-
var unexpectedBetweenGenericParametersAndBaseType: UnexpectedNodesSyntax? { unexpectedBetweenGenericParameterClauseAndBaseType }
211+
var unexpectedBetweenGenericParametersAndBaseType: UnexpectedNodesSyntax? {
212+
get {
213+
return unexpectedBetweenGenericParameterClauseAndBaseType
214+
}
215+
set(value) {
216+
unexpectedBetweenGenericParameterClauseAndBaseType = value
217+
}
218+
}
97219

98220
@available(*, deprecated, message: "Use an initializer with a genericParameterClause argument.")
99221
init(
@@ -117,18 +239,39 @@ public extension NamedOpaqueReturnTypeSyntax {
117239
}
118240
}
119241

120-
extension TupleExprSyntax {
242+
public extension TupleExprSyntax {
121243
@available(*, deprecated, renamed: "unexpectedBetweenLeftParenAndElements")
122-
public var unexpectedBetweenLeftParenAndElementList: UnexpectedNodesSyntax? { unexpectedBetweenLeftParenAndElements }
244+
var unexpectedBetweenLeftParenAndElementList: UnexpectedNodesSyntax? {
245+
get {
246+
return unexpectedBetweenLeftParenAndElements
247+
}
248+
set(value) {
249+
unexpectedBetweenLeftParenAndElements = value
250+
}
251+
}
123252

124253
@available(*, deprecated, renamed: "elements")
125-
public var elementList: TupleExprElementListSyntax { elements }
254+
var elementList: TupleExprElementListSyntax {
255+
get {
256+
return elements
257+
}
258+
set(value) {
259+
elements = value
260+
}
261+
}
126262

127263
@available(*, deprecated, renamed: "unexpectedBetweenElementsAndRightParen")
128-
public var unexpectedBetweenElementListAndRightParen: UnexpectedNodesSyntax? { unexpectedBetweenElementsAndRightParen }
264+
var unexpectedBetweenElementListAndRightParen: UnexpectedNodesSyntax? {
265+
get {
266+
return unexpectedBetweenElementsAndRightParen
267+
}
268+
set(value) {
269+
unexpectedBetweenElementsAndRightParen = value
270+
}
271+
}
129272

130273
@available(*, deprecated, message: "Use an initializer with a elements argument")
131-
public init(
274+
init(
132275
leadingTrivia: Trivia? = nil,
133276
_ unexpectedBeforeLeftParen: UnexpectedNodesSyntax? = nil,
134277
leftParen: TokenSyntax = .leftParenToken(),

‎Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1501,12 +1501,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
15011501
return "unexpectedBeforeLeftParen"
15021502
case \FunctionTypeSyntax.leftParen:
15031503
return "leftParen"
1504-
case \FunctionTypeSyntax.unexpectedBetweenLeftParenAndArguments:
1505-
return "unexpectedBetweenLeftParenAndArguments"
1506-
case \FunctionTypeSyntax.arguments:
1507-
return "arguments"
1508-
case \FunctionTypeSyntax.unexpectedBetweenArgumentsAndRightParen:
1509-
return "unexpectedBetweenArgumentsAndRightParen"
1504+
case \FunctionTypeSyntax.unexpectedBetweenLeftParenAndParameters:
1505+
return "unexpectedBetweenLeftParenAndParameters"
1506+
case \FunctionTypeSyntax.parameters:
1507+
return "parameters"
1508+
case \FunctionTypeSyntax.unexpectedBetweenParametersAndRightParen:
1509+
return "unexpectedBetweenParametersAndRightParen"
15101510
case \FunctionTypeSyntax.rightParen:
15111511
return "rightParen"
15121512
case \FunctionTypeSyntax.unexpectedBetweenRightParenAndEffectSpecifiers:

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9991,9 +9991,9 @@ public struct RawFunctionTypeSyntax: RawTypeSyntaxNodeProtocol {
99919991
public init(
99929992
_ unexpectedBeforeLeftParen: RawUnexpectedNodesSyntax? = nil,
99939993
leftParen: RawTokenSyntax,
9994-
_ unexpectedBetweenLeftParenAndArguments: RawUnexpectedNodesSyntax? = nil,
9995-
arguments: RawTupleTypeElementListSyntax,
9996-
_ unexpectedBetweenArgumentsAndRightParen: RawUnexpectedNodesSyntax? = nil,
9994+
_ unexpectedBetweenLeftParenAndParameters: RawUnexpectedNodesSyntax? = nil,
9995+
parameters: RawTupleTypeElementListSyntax,
9996+
_ unexpectedBetweenParametersAndRightParen: RawUnexpectedNodesSyntax? = nil,
99979997
rightParen: RawTokenSyntax,
99989998
_ unexpectedBetweenRightParenAndEffectSpecifiers: RawUnexpectedNodesSyntax? = nil,
99999999
effectSpecifiers: RawTypeEffectSpecifiersSyntax?,
@@ -10007,9 +10007,9 @@ public struct RawFunctionTypeSyntax: RawTypeSyntaxNodeProtocol {
1000710007
layout.initialize(repeating: nil)
1000810008
layout[0] = unexpectedBeforeLeftParen?.raw
1000910009
layout[1] = leftParen.raw
10010-
layout[2] = unexpectedBetweenLeftParenAndArguments?.raw
10011-
layout[3] = arguments.raw
10012-
layout[4] = unexpectedBetweenArgumentsAndRightParen?.raw
10010+
layout[2] = unexpectedBetweenLeftParenAndParameters?.raw
10011+
layout[3] = parameters.raw
10012+
layout[4] = unexpectedBetweenParametersAndRightParen?.raw
1001310013
layout[5] = rightParen.raw
1001410014
layout[6] = unexpectedBetweenRightParenAndEffectSpecifiers?.raw
1001510015
layout[7] = effectSpecifiers?.raw
@@ -10028,15 +10028,15 @@ public struct RawFunctionTypeSyntax: RawTypeSyntaxNodeProtocol {
1002810028
layoutView.children[1].map(RawTokenSyntax.init(raw:))!
1002910029
}
1003010030

10031-
public var unexpectedBetweenLeftParenAndArguments: RawUnexpectedNodesSyntax? {
10031+
public var unexpectedBetweenLeftParenAndParameters: RawUnexpectedNodesSyntax? {
1003210032
layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
1003310033
}
1003410034

10035-
public var arguments: RawTupleTypeElementListSyntax {
10035+
public var parameters: RawTupleTypeElementListSyntax {
1003610036
layoutView.children[3].map(RawTupleTypeElementListSyntax.init(raw:))!
1003710037
}
1003810038

10039-
public var unexpectedBetweenArgumentsAndRightParen: RawUnexpectedNodesSyntax? {
10039+
public var unexpectedBetweenParametersAndRightParen: RawUnexpectedNodesSyntax? {
1004010040
layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
1004110041
}
1004210042

0 commit comments

Comments
 (0)