Skip to content

Commit 1e795e9

Browse files
TTOzziTTOzzi
committed
Change children naming inconsistencies between similar/dual syntax nodes
1 parent b950ac0 commit 1e795e9

File tree

12 files changed

+393
-163
lines changed

12 files changed

+393
-163
lines changed

‎CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ public let ATTRIBUTE_NODES: [Node] = [
168168
documentation: "The colon separating the label and the value"
169169
),
170170
Child(
171-
name: "AvailabilityList",
172-
kind: .collection(kind: .availabilitySpecList, collectionElementName: "Availability")
171+
name: "AvailabilityArguments",
172+
kind: .collection(kind: .availabilitySpecList, collectionElementName: "AvailabilityArgument")
173173
),
174174
Child(
175175
name: "Semicolon",
@@ -227,8 +227,8 @@ public let ATTRIBUTE_NODES: [Node] = [
227227
documentation: "The colon separating \"before\" and the parameter list."
228228
),
229229
Child(
230-
name: "VersionList",
231-
kind: .collection(kind: .availabilityVersionRestrictionList, collectionElementName: "Availability"),
230+
name: "Platforms",
231+
kind: .collection(kind: .availabilityVersionRestrictionList, collectionElementName: "Platform"),
232232
documentation: "The list of OS versions in which the declaration became ABI stable."
233233
),
234234
]

‎CodeGeneration/Sources/SyntaxSupport/GenericNodes.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public let GENERIC_NODES: [Node] = [
4444
kind: .token(choices: [.token(tokenKind: "LeftAngleToken")])
4545
),
4646
Child(
47-
name: "GenericParameterList",
48-
kind: .collection(kind: .genericParameterList, collectionElementName: "GenericParameter")
47+
name: "Parameters",
48+
kind: .collection(kind: .genericParameterList, collectionElementName: "Parameter")
4949
),
5050
Child(
5151
name: "GenericWhereClause",

‎CodeGeneration/Sources/SyntaxSupport/StmtNodes.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public let STMT_NODES: [Node] = [
2626
kind: .token(choices: [.token(tokenKind: "LeftParenToken")])
2727
),
2828
Child(
29-
name: "AvailabilitySpec",
29+
name: "AvailabilityArguments",
3030
kind: .collection(kind: .availabilitySpecList, collectionElementName: "AvailabilityArgument")
3131
),
3232
Child(

‎Sources/SwiftParser/Attributes.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ extension Parser {
729729
label: ident,
730730
unexpectedBeforeColon,
731731
colon: colon,
732-
availabilityList: availability,
732+
availabilityArguments: availability,
733733
unexpectedBeforeSemi,
734734
semicolon: semi,
735735
arena: self.arena
@@ -949,7 +949,7 @@ extension Parser {
949949
beforeLabel: label,
950950
unexpectedBeforeColon,
951951
colon: colon,
952-
versionList: RawAvailabilityVersionRestrictionListSyntax(elements: elements, arena: self.arena),
952+
platforms: RawAvailabilityVersionRestrictionListSyntax(elements: elements, arena: self.arena),
953953
arena: self.arena
954954
)
955955
}

‎Sources/SwiftParser/Declarations.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ extension Parser {
469469
return RawGenericParameterClauseSyntax(
470470
remainingTokens,
471471
leftAngleBracket: missingToken(.leftAngle),
472-
genericParameterList: RawGenericParameterListSyntax(elements: [], arena: self.arena),
472+
parameters: RawGenericParameterListSyntax(elements: [], arena: self.arena),
473473
genericWhereClause: nil,
474474
rightAngleBracket: missingToken(.rightAngle),
475475
arena: self.arena
@@ -574,7 +574,7 @@ extension Parser {
574574
}
575575
return RawGenericParameterClauseSyntax(
576576
leftAngleBracket: langle,
577-
genericParameterList: parameters,
577+
parameters: parameters,
578578
genericWhereClause: whereClause,
579579
rightAngleBracket: rangle,
580580
arena: self.arena

‎Sources/SwiftParser/Statements.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ extension Parser {
336336
precondition(self.at(.poundAvailableKeyword, .poundUnavailableKeyword))
337337
let keyword = self.consumeAnyToken()
338338
let (unexpectedBeforeLParen, lparen) = self.expect(.leftParen)
339-
let spec = self.parseAvailabilitySpecList()
339+
let arguments = self.parseAvailabilitySpecList()
340340
let (unexpectedBeforeRParen, rparen) = self.expect(.rightParen)
341341
let unexpectedAfterRParen: RawUnexpectedNodesSyntax?
342342
if let (equalOperator, falseKeyword) = self.consume(if: { $0.isContextualPunctuator("==") }, followedBy: { TokenSpec.keyword(.false) ~= $0 }) {
@@ -349,7 +349,7 @@ extension Parser {
349349
availabilityKeyword: keyword,
350350
unexpectedBeforeLParen,
351351
leftParen: lparen,
352-
availabilitySpec: spec,
352+
availabilityArguments: arguments,
353353
unexpectedBeforeRParen,
354354
rightParen: rparen,
355355
unexpectedAfterRParen,

‎Sources/SwiftRefactor/OpaqueParameterToGeneric.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public struct OpaqueParameterToGeneric: RefactoringProvider {
134134

135135
var newGenericParams: [GenericParameterSyntax] = []
136136
if let genericParams {
137-
newGenericParams.append(contentsOf: genericParams.genericParameterList)
137+
newGenericParams.append(contentsOf: genericParams.parameters)
138138
}
139139

140140
for rewritten in rewriter.rewrittenSomeParameters {
@@ -154,13 +154,13 @@ public struct OpaqueParameterToGeneric: RefactoringProvider {
154154
let newGenericParamClause: GenericParameterClauseSyntax
155155
if let genericParams {
156156
newGenericParamClause = genericParams.with(
157-
\.genericParameterList,
157+
\.parameters,
158158
newGenericParamSyntax
159159
)
160160
} else {
161161
newGenericParamClause = GenericParameterClauseSyntax(
162162
leftAngleBracket: .leftAngleToken(),
163-
genericParameterList: newGenericParamSyntax,
163+
parameters: newGenericParamSyntax,
164164
genericWhereClause: nil,
165165
rightAngleBracket: .rightAngleToken()
166166
)

‎Sources/SwiftSyntax/SwiftSyntaxCompatibility.swift

Lines changed: 230 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,3 +315,233 @@ public extension EditorPlaceholderDeclSyntax {
315315
)
316316
}
317317
}
318+
319+
public extension AvailabilityConditionSyntax {
320+
@available(*, deprecated, renamed: "unexpectedBetweenLeftParenAndAvailabilityArguments")
321+
var unexpectedBetweenLeftParenAndAvailabilitySpec: UnexpectedNodesSyntax? {
322+
get { unexpectedBetweenLeftParenAndAvailabilityArguments }
323+
set { unexpectedBetweenLeftParenAndAvailabilityArguments = newValue }
324+
}
325+
326+
@available(*, deprecated, renamed: "availabilityArguments")
327+
var availabilitySpec: AvailabilitySpecListSyntax {
328+
get { availabilityArguments }
329+
set { availabilityArguments = newValue }
330+
}
331+
332+
@available(*, deprecated, renamed: "unexpectedBetweenAvailabilityArgumentsAndRightParen")
333+
var unexpectedBetweenAvailabilitySpecAndRightParen: UnexpectedNodesSyntax? {
334+
get { unexpectedBetweenAvailabilityArgumentsAndRightParen }
335+
set { unexpectedBetweenAvailabilityArgumentsAndRightParen = newValue }
336+
}
337+
338+
@available(*, deprecated, message: "Use an initializer with an availabilityArguments argument")
339+
init(
340+
leadingTrivia: Trivia? = nil,
341+
_ unexpectedBeforeAvailabilityKeyword: UnexpectedNodesSyntax? = nil,
342+
availabilityKeyword: TokenSyntax,
343+
_ unexpectedBetweenAvailabilityKeywordAndLeftParen: UnexpectedNodesSyntax? = nil,
344+
leftParen: TokenSyntax = .leftParenToken(),
345+
_ unexpectedBetweenLeftParenAndAvailabilitySpec: UnexpectedNodesSyntax? = nil,
346+
availabilitySpec: AvailabilitySpecListSyntax,
347+
_ unexpectedBetweenAvailabilitySpecAndRightParen: UnexpectedNodesSyntax? = nil,
348+
rightParen: TokenSyntax = .rightParenToken(),
349+
_ unexpectedAfterRightParen: UnexpectedNodesSyntax? = nil,
350+
trailingTrivia: Trivia? = nil
351+
) {
352+
self.init(
353+
leadingTrivia: leadingTrivia,
354+
unexpectedBeforeAvailabilityKeyword,
355+
availabilityKeyword: availabilityKeyword,
356+
unexpectedBetweenAvailabilityKeywordAndLeftParen,
357+
leftParen: leftParen,
358+
unexpectedBetweenLeftParenAndAvailabilitySpec,
359+
availabilityArguments: availabilitySpec,
360+
unexpectedBetweenAvailabilitySpecAndRightParen,
361+
rightParen: rightParen,
362+
unexpectedAfterRightParen,
363+
trailingTrivia: trailingTrivia
364+
)
365+
}
366+
}
367+
368+
public extension AvailabilityEntrySyntax {
369+
@available(*, deprecated, renamed: "unexpectedBetweenColonAndAvailabilityArguments")
370+
var unexpectedBetweenColonAndAvailabilityList: UnexpectedNodesSyntax? {
371+
get { unexpectedBetweenColonAndAvailabilityArguments }
372+
set { unexpectedBetweenColonAndAvailabilityArguments = newValue }
373+
}
374+
375+
@available(*, deprecated, renamed: "availabilityArguments")
376+
var availabilityList: AvailabilitySpecListSyntax {
377+
get { availabilityArguments }
378+
set { availabilityArguments = newValue }
379+
}
380+
381+
@available(*, deprecated, renamed: "unexpectedBetweenAvailabilityArgumentsAndSemicolon")
382+
var unexpectedBetweenAvailabilityListAndSemicolon: UnexpectedNodesSyntax? {
383+
get { unexpectedBetweenAvailabilityArgumentsAndSemicolon }
384+
set { unexpectedBetweenAvailabilityArgumentsAndSemicolon = newValue }
385+
}
386+
387+
/// Adds the provided `element` to the node's `availabilityList`
388+
/// collection.
389+
/// - param element: The new `Availability` to add to the node's
390+
/// `availabilityList` collection.
391+
/// - returns: A copy of the receiver with the provided `Availability`
392+
/// appended to its `availabilityList` collection.
393+
@available(*, deprecated, renamed: "addAvailabilityArgument")
394+
func addAvailability(_ element: AvailabilityArgumentSyntax) -> AvailabilityEntrySyntax {
395+
addAvailabilityArgument(element)
396+
}
397+
398+
@available(*, deprecated, message: "Use an initializer with an availabilityArguments argument")
399+
init(
400+
leadingTrivia: Trivia? = nil,
401+
_ unexpectedBeforeLabel: UnexpectedNodesSyntax? = nil,
402+
label: TokenSyntax = .keyword(.availability),
403+
_ unexpectedBetweenLabelAndColon: UnexpectedNodesSyntax? = nil,
404+
colon: TokenSyntax = .colonToken(),
405+
_ unexpectedBetweenColonAndAvailabilityList: UnexpectedNodesSyntax? = nil,
406+
availabilityList: AvailabilitySpecListSyntax,
407+
_ unexpectedBetweenAvailabilityListAndSemicolon: UnexpectedNodesSyntax? = nil,
408+
semicolon: TokenSyntax = .semicolonToken(),
409+
_ unexpectedAfterSemicolon: UnexpectedNodesSyntax? = nil,
410+
trailingTrivia: Trivia? = nil
411+
) {
412+
self.init(
413+
leadingTrivia: leadingTrivia,
414+
unexpectedBeforeLabel,
415+
label: label,
416+
unexpectedBetweenLabelAndColon,
417+
colon: colon,
418+
unexpectedBetweenColonAndAvailabilityList,
419+
availabilityArguments: availabilityList,
420+
unexpectedBetweenAvailabilityListAndSemicolon,
421+
semicolon: semicolon,
422+
unexpectedAfterSemicolon,
423+
trailingTrivia: trailingTrivia
424+
)
425+
}
426+
}
427+
428+
public extension BackDeployedAttributeSpecListSyntax {
429+
@available(*, deprecated, renamed: "unexpectedBetweenColonAndPlatforms")
430+
var unexpectedBetweenColonAndVersionList: UnexpectedNodesSyntax? {
431+
get { unexpectedBetweenColonAndPlatforms }
432+
set { unexpectedBetweenColonAndPlatforms = newValue }
433+
}
434+
435+
@available(*, deprecated, renamed: "platforms")
436+
var versionList: AvailabilityVersionRestrictionListSyntax {
437+
get { platforms }
438+
set { platforms = newValue }
439+
}
440+
441+
@available(*, deprecated, renamed: "unexpectedAfterPlatforms")
442+
var unexpectedAfterVersionList: UnexpectedNodesSyntax? {
443+
get { unexpectedAfterPlatforms }
444+
set { unexpectedAfterPlatforms = newValue }
445+
}
446+
447+
/// Adds the provided `element` to the node's `versionList`
448+
/// collection.
449+
/// - param element: The new `Availability` to add to the node's
450+
/// `versionList` collection.
451+
/// - returns: A copy of the receiver with the provided `Availability`
452+
/// appended to its `versionList` collection.
453+
@available(*, deprecated, renamed: "addPlatform")
454+
func addAvailability(_ element: AvailabilityVersionRestrictionListEntrySyntax) -> BackDeployedAttributeSpecListSyntax {
455+
addPlatform(element)
456+
}
457+
458+
@available(*, deprecated, message: "Use an initializer with a platforms argument")
459+
init(
460+
leadingTrivia: Trivia? = nil,
461+
_ unexpectedBeforeBeforeLabel: UnexpectedNodesSyntax? = nil,
462+
beforeLabel: TokenSyntax = .keyword(.before),
463+
_ unexpectedBetweenBeforeLabelAndColon: UnexpectedNodesSyntax? = nil,
464+
colon: TokenSyntax = .colonToken(),
465+
_ unexpectedBetweenColonAndVersionList: UnexpectedNodesSyntax? = nil,
466+
versionList: AvailabilityVersionRestrictionListSyntax,
467+
_ unexpectedAfterVersionList: UnexpectedNodesSyntax? = nil,
468+
trailingTrivia: Trivia? = nil
469+
) {
470+
self.init(
471+
leadingTrivia: leadingTrivia,
472+
unexpectedBeforeBeforeLabel,
473+
beforeLabel: beforeLabel,
474+
unexpectedBetweenBeforeLabelAndColon,
475+
colon: colon,
476+
unexpectedBetweenColonAndVersionList,
477+
platforms: versionList,
478+
unexpectedAfterVersionList,
479+
trailingTrivia: trailingTrivia
480+
)
481+
}
482+
}
483+
484+
public extension GenericParameterClauseSyntax {
485+
@available(*, deprecated, renamed: "unexpectedBetweenLeftAngleBracketAndParameters")
486+
var unexpectedBetweenLeftAngleBracketAndGenericParameterList: UnexpectedNodesSyntax? {
487+
get { unexpectedBetweenLeftAngleBracketAndParameters }
488+
set { unexpectedBetweenLeftAngleBracketAndParameters = newValue }
489+
}
490+
491+
@available(*, deprecated, renamed: "parameters")
492+
var genericParameterList: GenericParameterListSyntax {
493+
get { parameters }
494+
set { parameters = newValue }
495+
}
496+
497+
@available(*, deprecated, renamed: "unexpectedBetweenParametersAndGenericWhereClause")
498+
var unexpectedBetweenGenericParameterListAndGenericWhereClause: UnexpectedNodesSyntax? {
499+
get { unexpectedBetweenParametersAndGenericWhereClause }
500+
set { unexpectedBetweenParametersAndGenericWhereClause = newValue }
501+
}
502+
503+
/// Adds the provided `element` to the node's `genericParameterList`
504+
/// collection.
505+
/// - param element: The new `GenericParameter` to add to the node's
506+
/// `genericParameterList` collection.
507+
/// - returns: A copy of the receiver with the provided `GenericParameter`
508+
/// appended to its `genericParameterList` collection.
509+
@available(*, deprecated, renamed: "addParameter")
510+
func addGenericParameter(_ element: GenericParameterSyntax) -> GenericParameterClauseSyntax {
511+
addParameter(element)
512+
}
513+
514+
@available(*, deprecated, message: "Use an initializer with a parameters argument")
515+
init(
516+
leadingTrivia: Trivia? = nil,
517+
_ unexpectedBeforeLeftAngleBracket: UnexpectedNodesSyntax? = nil,
518+
leftAngleBracket: TokenSyntax = .leftAngleToken(),
519+
_ unexpectedBetweenLeftAngleBracketAndGenericParameterList: UnexpectedNodesSyntax? = nil,
520+
genericParameterList: GenericParameterListSyntax,
521+
_ unexpectedBetweenGenericParameterListAndGenericWhereClause: UnexpectedNodesSyntax? = nil,
522+
genericWhereClause: GenericWhereClauseSyntax? = nil,
523+
_ unexpectedBetweenGenericWhereClauseAndRightAngleBracket: UnexpectedNodesSyntax? = nil,
524+
rightAngleBracket: TokenSyntax = .rightAngleToken(),
525+
_ unexpectedAfterRightAngleBracket: UnexpectedNodesSyntax? = nil,
526+
trailingTrivia: Trivia? = nil
527+
) {
528+
self.init(
529+
leadingTrivia: leadingTrivia,
530+
unexpectedBeforeLeftAngleBracket,
531+
leftAngleBracket: leftAngleBracket,
532+
unexpectedBetweenLeftAngleBracketAndGenericParameterList,
533+
parameters: genericParameterList,
534+
unexpectedBetweenGenericParameterListAndGenericWhereClause,
535+
genericWhereClause: genericWhereClause,
536+
unexpectedBetweenGenericWhereClauseAndRightAngleBracket,
537+
rightAngleBracket: rightAngleBracket,
538+
unexpectedAfterRightAngleBracket,
539+
trailingTrivia: trailingTrivia
540+
)
541+
}
542+
}
543+
544+
//==========================================================================//
545+
// IMPORTANT: If you are tempted to add a compatiblity layer code here //
546+
// please insert it in alphabetical order above //
547+
//==========================================================================//

0 commit comments

Comments
 (0)