Skip to content

Commit 5387d3e

Browse files
committed
Rename genericParameters of NamedOpaqueReturnTypeSyntax
1 parent 61e408f commit 5387d3e

File tree

4 files changed

+61
-12
lines changed

4 files changed

+61
-12
lines changed

Sources/SwiftParser/Types.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,7 @@ extension Parser {
10451045
let baseType = self.parseType()
10461046
return RawTypeSyntax(
10471047
RawNamedOpaqueReturnTypeSyntax(
1048-
genericParameters: generics,
1048+
genericParameterClause: generics,
10491049
baseType: baseType,
10501050
arena: self.arena
10511051
)

Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2243,8 +2243,8 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
22432243
return "unexpectedAfterClosure"
22442244
case \NamedOpaqueReturnTypeSyntax.unexpectedBeforeGenericParameters:
22452245
return "unexpectedBeforeGenericParameters"
2246-
case \NamedOpaqueReturnTypeSyntax.genericParameters:
2247-
return "genericParameters"
2246+
case \NamedOpaqueReturnTypeSyntax.genericParameterClause:
2247+
return "genericParameterClause"
22482248
case \NamedOpaqueReturnTypeSyntax.unexpectedBetweenGenericParametersAndBaseType:
22492249
return "unexpectedBetweenGenericParametersAndBaseType"
22502250
case \NamedOpaqueReturnTypeSyntax.baseType:

Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14925,7 +14925,7 @@ public struct RawNamedOpaqueReturnTypeSyntax: RawTypeSyntaxNodeProtocol {
1492514925

1492614926
public init(
1492714927
_ unexpectedBeforeGenericParameters: RawUnexpectedNodesSyntax? = nil,
14928-
genericParameters: RawGenericParameterClauseSyntax,
14928+
genericParameterClause: RawGenericParameterClauseSyntax,
1492914929
_ unexpectedBetweenGenericParametersAndBaseType: RawUnexpectedNodesSyntax? = nil,
1493014930
baseType: RawTypeSyntax,
1493114931
_ unexpectedAfterBaseType: RawUnexpectedNodesSyntax? = nil,
@@ -14935,7 +14935,7 @@ public struct RawNamedOpaqueReturnTypeSyntax: RawTypeSyntaxNodeProtocol {
1493514935
kind: .namedOpaqueReturnType, uninitializedCount: 5, arena: arena) { layout in
1493614936
layout.initialize(repeating: nil)
1493714937
layout[0] = unexpectedBeforeGenericParameters?.raw
14938-
layout[1] = genericParameters.raw
14938+
layout[1] = genericParameterClause.raw
1493914939
layout[2] = unexpectedBetweenGenericParametersAndBaseType?.raw
1494014940
layout[3] = baseType.raw
1494114941
layout[4] = unexpectedAfterBaseType?.raw
@@ -14947,7 +14947,7 @@ public struct RawNamedOpaqueReturnTypeSyntax: RawTypeSyntaxNodeProtocol {
1494714947
layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
1494814948
}
1494914949

14950-
public var genericParameters: RawGenericParameterClauseSyntax {
14950+
public var genericParameterClause: RawGenericParameterClauseSyntax {
1495114951
layoutView.children[1].map(RawGenericParameterClauseSyntax.init(raw:))!
1495214952
}
1495314953

@@ -14964,6 +14964,30 @@ public struct RawNamedOpaqueReturnTypeSyntax: RawTypeSyntaxNodeProtocol {
1496414964
}
1496514965
}
1496614966

14967+
public extension RawNamedOpaqueReturnTypeSyntax {
14968+
@available(*, deprecated, renamed: "genericParameterClause")
14969+
var genericParameters: RawGenericParameterClauseSyntax? { genericParameterClause }
14970+
14971+
@available(*, deprecated, message: "Use an initializer with a genericParameterClause argument.")
14972+
init(
14973+
_ unexpectedBeforeGenericParameters: RawUnexpectedNodesSyntax? = nil,
14974+
genericParameters: RawGenericParameterClauseSyntax,
14975+
_ unexpectedBetweenGenericParametersAndBaseType: RawUnexpectedNodesSyntax? = nil,
14976+
baseType: RawTypeSyntax,
14977+
_ unexpectedAfterBaseType: RawUnexpectedNodesSyntax? = nil,
14978+
arena: __shared SyntaxArena
14979+
) {
14980+
self.init(
14981+
unexpectedBeforeGenericParameters,
14982+
genericParameterClause: genericParameters,
14983+
unexpectedBetweenGenericParametersAndBaseType,
14984+
baseType: baseType,
14985+
unexpectedAfterBaseType,
14986+
arena: arena
14987+
)
14988+
}
14989+
}
14990+
1496714991
@_spi(RawSyntax)
1496814992
public struct RawNilLiteralExprSyntax: RawExprSyntaxNodeProtocol {
1496914993
@_spi(RawSyntax)

Sources/SwiftSyntax/generated/syntaxNodes/SyntaxTypeNodes.swift

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1542,25 +1542,24 @@ public struct NamedOpaqueReturnTypeSyntax: TypeSyntaxProtocol, SyntaxHashable {
15421542
public init(
15431543
leadingTrivia: Trivia? = nil,
15441544
_ unexpectedBeforeGenericParameters: UnexpectedNodesSyntax? = nil,
1545-
genericParameters: GenericParameterClauseSyntax,
1545+
genericParameterClause: GenericParameterClauseSyntax,
15461546
_ unexpectedBetweenGenericParametersAndBaseType: UnexpectedNodesSyntax? = nil,
15471547
baseType: some TypeSyntaxProtocol,
15481548
_ unexpectedAfterBaseType: UnexpectedNodesSyntax? = nil,
15491549
trailingTrivia: Trivia? = nil
1550-
15511550
) {
15521551
// Extend the lifetime of all parameters so their arenas don't get destroyed
15531552
// before they can be added as children of the new arena.
15541553
let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
15551554
unexpectedBeforeGenericParameters,
1556-
genericParameters,
1555+
genericParameterClause,
15571556
unexpectedBetweenGenericParametersAndBaseType,
15581557
baseType,
15591558
unexpectedAfterBaseType
15601559
))) {(arena, _) in
15611560
let layout: [RawSyntax?] = [
15621561
unexpectedBeforeGenericParameters?.raw,
1563-
genericParameters.raw,
1562+
genericParameterClause.raw,
15641563
unexpectedBetweenGenericParametersAndBaseType?.raw,
15651564
baseType.raw,
15661565
unexpectedAfterBaseType?.raw
@@ -1587,7 +1586,7 @@ public struct NamedOpaqueReturnTypeSyntax: TypeSyntaxProtocol, SyntaxHashable {
15871586
}
15881587
}
15891588

1590-
public var genericParameters: GenericParameterClauseSyntax {
1589+
public var genericParameterClause: GenericParameterClauseSyntax {
15911590
get {
15921591
return GenericParameterClauseSyntax(data.child(at: 1, parent: Syntax(self))!)
15931592
}
@@ -1626,14 +1625,40 @@ public struct NamedOpaqueReturnTypeSyntax: TypeSyntaxProtocol, SyntaxHashable {
16261625
public static var structure: SyntaxNodeStructure {
16271626
return .layout([
16281627
\Self.unexpectedBeforeGenericParameters,
1629-
\Self.genericParameters,
1628+
\Self.genericParameterClause,
16301629
\Self.unexpectedBetweenGenericParametersAndBaseType,
16311630
\Self.baseType,
16321631
\Self.unexpectedAfterBaseType
16331632
])
16341633
}
16351634
}
16361635

1636+
public extension NamedOpaqueReturnTypeSyntax {
1637+
@available(*, deprecated, renamed: "genericParameterClause")
1638+
var genericParameters: GenericParameterClauseSyntax? { genericParameterClause }
1639+
1640+
@available(*, deprecated, message: "Use an initializer with a genericParameterClause argument.")
1641+
init(
1642+
leadingTrivia: Trivia? = nil,
1643+
_ unexpectedBeforeGenericParameters: UnexpectedNodesSyntax? = nil,
1644+
genericParameters: GenericParameterClauseSyntax,
1645+
_ unexpectedBetweenGenericParametersAndBaseType: UnexpectedNodesSyntax? = nil,
1646+
baseType: some TypeSyntaxProtocol,
1647+
_ unexpectedAfterBaseType: UnexpectedNodesSyntax? = nil,
1648+
trailingTrivia: Trivia? = nil
1649+
) {
1650+
self.init(
1651+
leadingTrivia: leadingTrivia,
1652+
unexpectedBeforeGenericParameters,
1653+
genericParameterClause: genericParameters,
1654+
unexpectedBetweenGenericParametersAndBaseType,
1655+
baseType: baseType,
1656+
unexpectedAfterBaseType,
1657+
trailingTrivia: trailingTrivia
1658+
)
1659+
}
1660+
}
1661+
16371662
// MARK: - OptionalTypeSyntax
16381663

16391664

0 commit comments

Comments
 (0)