Skip to content

Commit caa685e

Browse files
amritpanamritpan
committed
Regenerate for keypath methods.
1 parent cea4087 commit caa685e

18 files changed

+525
-3
lines changed

‎Sources/SwiftParser/generated/ExperimentalFeatures.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ extension Parser.ExperimentalFeatures {
5151
/// Whether to enable the parsing of 'unsafe' expression.
5252
public static let unsafeExpression = Self (rawValue: 1 << 8)
5353

54+
/// Whether to enable the parsing of keypaths with method members.
55+
public static let keypathWithMethodMembers = Self (rawValue: 1 << 9)
56+
5457
/// Creates a new value representing the experimental feature with the
5558
/// given name, or returns nil if the name is not recognized.
5659
public init?(name: String) {
@@ -73,6 +76,8 @@ extension Parser.ExperimentalFeatures {
7376
self = .abiAttribute
7477
case "WarnUnsafe":
7578
self = .unsafeExpression
79+
case "KeypathWithMethodMembers":
80+
self = .keypathWithMethodMembers
7681
default:
7782
return nil
7883
}

‎Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,8 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
206206
return "generic where clause"
207207
case \KeyPathExprSyntax.root:
208208
return "root"
209+
case \KeyPathMethodComponentSyntax.arguments:
210+
return "arguments"
209211
case \KeyPathSubscriptComponentSyntax.arguments:
210212
return "arguments"
211213
case \LabeledExprSyntax.label:

‎Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,8 @@ extension SyntaxKind {
241241
return "key path component"
242242
case .keyPathExpr:
243243
return "key path"
244+
case .keyPathMethodComponent:
245+
return "key path method component"
244246
case .keyPathOptionalComponent:
245247
return "key path optional component"
246248
case .keyPathPropertyComponent:

‎Sources/SwiftSyntax/Documentation.docc/generated/SwiftSyntax.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
355355
- <doc:SwiftSyntax/GenericParameterClauseSyntax>
356356
- <doc:SwiftSyntax/InheritanceClauseSyntax>
357357
- <doc:SwiftSyntax/InitializerClauseSyntax>
358+
- <doc:SwiftSyntax/KeyPathMethodComponentSyntax>
358359
- <doc:SwiftSyntax/KeyPathOptionalComponentSyntax>
359360
- <doc:SwiftSyntax/KeyPathPropertyComponentSyntax>
360361
- <doc:SwiftSyntax/KeyPathSubscriptComponentSyntax>

‎Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1887,6 +1887,28 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
18871887
return "components"
18881888
case \KeyPathExprSyntax.unexpectedAfterComponents:
18891889
return "unexpectedAfterComponents"
1890+
case \KeyPathMethodComponentSyntax.unexpectedBeforeDeclName:
1891+
return "unexpectedBeforeDeclName"
1892+
case \KeyPathMethodComponentSyntax.declName:
1893+
return "declName"
1894+
case \KeyPathMethodComponentSyntax.unexpectedBetweenDeclNameAndGenericArgumentClause:
1895+
return "unexpectedBetweenDeclNameAndGenericArgumentClause"
1896+
case \KeyPathMethodComponentSyntax.genericArgumentClause:
1897+
return "genericArgumentClause"
1898+
case \KeyPathMethodComponentSyntax.unexpectedBetweenGenericArgumentClauseAndLeftParen:
1899+
return "unexpectedBetweenGenericArgumentClauseAndLeftParen"
1900+
case \KeyPathMethodComponentSyntax.leftParen:
1901+
return "leftParen"
1902+
case \KeyPathMethodComponentSyntax.unexpectedBetweenLeftParenAndArguments:
1903+
return "unexpectedBetweenLeftParenAndArguments"
1904+
case \KeyPathMethodComponentSyntax.arguments:
1905+
return "arguments"
1906+
case \KeyPathMethodComponentSyntax.unexpectedBetweenArgumentsAndRightParen:
1907+
return "unexpectedBetweenArgumentsAndRightParen"
1908+
case \KeyPathMethodComponentSyntax.rightParen:
1909+
return "rightParen"
1910+
case \KeyPathMethodComponentSyntax.unexpectedAfterRightParen:
1911+
return "unexpectedAfterRightParen"
18901912
case \KeyPathOptionalComponentSyntax.unexpectedBeforeQuestionOrExclamationMark:
18911913
return "unexpectedBeforeQuestionOrExclamationMark"
18921914
case \KeyPathOptionalComponentSyntax.questionOrExclamationMark:

‎Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,6 +1292,14 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
12921292
visitAnyPost(node._syntaxNode)
12931293
}
12941294

1295+
override open func visit(_ node: KeyPathMethodComponentSyntax) -> SyntaxVisitorContinueKind {
1296+
return visitAny(node._syntaxNode)
1297+
}
1298+
1299+
override open func visitPost(_ node: KeyPathMethodComponentSyntax) {
1300+
visitAnyPost(node._syntaxNode)
1301+
}
1302+
12951303
override open func visit(_ node: KeyPathOptionalComponentSyntax) -> SyntaxVisitorContinueKind {
12961304
return visitAny(node._syntaxNode)
12971305
}

‎Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1671,6 +1671,7 @@ extension Syntax {
16711671
.node(KeyPathComponentListSyntax.self),
16721672
.node(KeyPathComponentSyntax.self),
16731673
.node(KeyPathExprSyntax.self),
1674+
.node(KeyPathMethodComponentSyntax.self),
16741675
.node(KeyPathOptionalComponentSyntax.self),
16751676
.node(KeyPathPropertyComponentSyntax.self),
16761677
.node(KeyPathSubscriptComponentSyntax.self),

‎Sources/SwiftSyntax/generated/SyntaxCollections.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,6 +1014,7 @@ public struct KeyPathComponentListSyntax: SyntaxCollection, SyntaxHashable {
10141014
/// - ``AttributeSyntax``.``AttributeSyntax/arguments``
10151015
/// - ``ExpressionSegmentSyntax``.``ExpressionSegmentSyntax/expressions``
10161016
/// - ``FunctionCallExprSyntax``.``FunctionCallExprSyntax/arguments``
1017+
/// - ``KeyPathMethodComponentSyntax``.``KeyPathMethodComponentSyntax/arguments``
10171018
/// - ``KeyPathSubscriptComponentSyntax``.``KeyPathSubscriptComponentSyntax/arguments``
10181019
/// - ``MacroExpansionDeclSyntax``.``MacroExpansionDeclSyntax/arguments``
10191020
/// - ``MacroExpansionExprSyntax``.``MacroExpansionExprSyntax/arguments``

‎Sources/SwiftSyntax/generated/SyntaxEnum.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ public enum SyntaxEnum: Sendable {
174174
case keyPathComponentList(KeyPathComponentListSyntax)
175175
case keyPathComponent(KeyPathComponentSyntax)
176176
case keyPathExpr(KeyPathExprSyntax)
177+
case keyPathMethodComponent(KeyPathMethodComponentSyntax)
177178
case keyPathOptionalComponent(KeyPathOptionalComponentSyntax)
178179
case keyPathPropertyComponent(KeyPathPropertyComponentSyntax)
179180
case keyPathSubscriptComponent(KeyPathSubscriptComponentSyntax)
@@ -635,6 +636,8 @@ extension Syntax {
635636
return .keyPathComponent(KeyPathComponentSyntax(self)!)
636637
case .keyPathExpr:
637638
return .keyPathExpr(KeyPathExprSyntax(self)!)
639+
case .keyPathMethodComponent:
640+
return .keyPathMethodComponent(KeyPathMethodComponentSyntax(self)!)
638641
case .keyPathOptionalComponent:
639642
return .keyPathOptionalComponent(KeyPathOptionalComponentSyntax(self)!)
640643
case .keyPathPropertyComponent:

‎Sources/SwiftSyntax/generated/SyntaxKind.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ public enum SyntaxKind: Sendable {
174174
case keyPathComponentList
175175
case keyPathComponent
176176
case keyPathExpr
177+
case keyPathMethodComponent
177178
case keyPathOptionalComponent
178179
case keyPathPropertyComponent
179180
case keyPathSubscriptComponent
@@ -760,6 +761,8 @@ public enum SyntaxKind: Sendable {
760761
return KeyPathComponentSyntax.self
761762
case .keyPathExpr:
762763
return KeyPathExprSyntax.self
764+
case .keyPathMethodComponent:
765+
return KeyPathMethodComponentSyntax.self
763766
case .keyPathOptionalComponent:
764767
return KeyPathOptionalComponentSyntax.self
765768
case .keyPathPropertyComponent:

‎Sources/SwiftSyntax/generated/SyntaxRewriter.swift

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,6 +1175,13 @@ open class SyntaxRewriter {
11751175
return ExprSyntax(KeyPathExprSyntax(unsafeCasting: visitChildren(node._syntaxNode)))
11761176
}
11771177

1178+
/// Visit a ``KeyPathMethodComponentSyntax``.
1179+
/// - Parameter node: the node that is being visited
1180+
/// - Returns: the rewritten node
1181+
open func visit(_ node: KeyPathMethodComponentSyntax) -> KeyPathMethodComponentSyntax {
1182+
return KeyPathMethodComponentSyntax(unsafeCasting: visitChildren(node._syntaxNode))
1183+
}
1184+
11781185
/// Visit a ``KeyPathOptionalComponentSyntax``.
11791186
/// - Parameter node: the node that is being visited
11801187
/// - Returns: the rewritten node
@@ -2919,6 +2926,11 @@ open class SyntaxRewriter {
29192926
Syntax(visit(KeyPathExprSyntax(unsafeCasting: node)))
29202927
}
29212928

2929+
@inline(never)
2930+
private func visitKeyPathMethodComponentSyntaxImpl(_ node: Syntax) -> Syntax {
2931+
Syntax(visit(KeyPathMethodComponentSyntax(unsafeCasting: node)))
2932+
}
2933+
29222934
@inline(never)
29232935
private func visitKeyPathOptionalComponentSyntaxImpl(_ node: Syntax) -> Syntax {
29242936
Syntax(visit(KeyPathOptionalComponentSyntax(unsafeCasting: node)))
@@ -3913,6 +3925,8 @@ open class SyntaxRewriter {
39133925
return self.visitKeyPathComponentSyntaxImpl(_:)
39143926
case .keyPathExpr:
39153927
return self.visitKeyPathExprSyntaxImpl(_:)
3928+
case .keyPathMethodComponent:
3929+
return self.visitKeyPathMethodComponentSyntaxImpl(_:)
39163930
case .keyPathOptionalComponent:
39173931
return self.visitKeyPathOptionalComponentSyntaxImpl(_:)
39183932
case .keyPathPropertyComponent:
@@ -4493,6 +4507,8 @@ open class SyntaxRewriter {
44934507
return visitKeyPathComponentSyntaxImpl(node)
44944508
case .keyPathExpr:
44954509
return visitKeyPathExprSyntaxImpl(node)
4510+
case .keyPathMethodComponent:
4511+
return visitKeyPathMethodComponentSyntaxImpl(node)
44964512
case .keyPathOptionalComponent:
44974513
return visitKeyPathOptionalComponentSyntaxImpl(node)
44984514
case .keyPathPropertyComponent:

‎Sources/SwiftSyntax/generated/SyntaxVisitor.swift

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1882,6 +1882,18 @@ open class SyntaxVisitor {
18821882
open func visitPost(_ node: KeyPathExprSyntax) {
18831883
}
18841884

1885+
/// Visiting ``KeyPathMethodComponentSyntax`` specifically.
1886+
/// - Parameter node: the node we are visiting.
1887+
/// - Returns: how should we continue visiting.
1888+
open func visit(_ node: KeyPathMethodComponentSyntax) -> SyntaxVisitorContinueKind {
1889+
return .visitChildren
1890+
}
1891+
1892+
/// The function called after visiting ``KeyPathMethodComponentSyntax`` and its descendants.
1893+
/// - node: the node we just finished visiting.
1894+
open func visitPost(_ node: KeyPathMethodComponentSyntax) {
1895+
}
1896+
18851897
/// Visiting ``KeyPathOptionalComponentSyntax`` specifically.
18861898
/// - Parameter node: the node we are visiting.
18871899
/// - Returns: how should we continue visiting.
@@ -4739,6 +4751,14 @@ open class SyntaxVisitor {
47394751
visitPost(KeyPathExprSyntax(unsafeCasting: node))
47404752
}
47414753

4754+
@inline(never)
4755+
private func visitKeyPathMethodComponentSyntaxImpl(_ node: Syntax) {
4756+
if visit(KeyPathMethodComponentSyntax(unsafeCasting: node)) == .visitChildren {
4757+
visitChildren(node)
4758+
}
4759+
visitPost(KeyPathMethodComponentSyntax(unsafeCasting: node))
4760+
}
4761+
47424762
@inline(never)
47434763
private func visitKeyPathOptionalComponentSyntaxImpl(_ node: Syntax) {
47444764
if visit(KeyPathOptionalComponentSyntax(unsafeCasting: node)) == .visitChildren {
@@ -6129,6 +6149,8 @@ open class SyntaxVisitor {
61296149
return self.visitKeyPathComponentSyntaxImpl(_:)
61306150
case .keyPathExpr:
61316151
return self.visitKeyPathExprSyntaxImpl(_:)
6152+
case .keyPathMethodComponent:
6153+
return self.visitKeyPathMethodComponentSyntaxImpl(_:)
61326154
case .keyPathOptionalComponent:
61336155
return self.visitKeyPathOptionalComponentSyntaxImpl(_:)
61346156
case .keyPathPropertyComponent:
@@ -6709,6 +6731,8 @@ open class SyntaxVisitor {
67096731
self.visitKeyPathComponentSyntaxImpl(node)
67106732
case .keyPathExpr:
67116733
self.visitKeyPathExprSyntaxImpl(node)
6734+
case .keyPathMethodComponent:
6735+
self.visitKeyPathMethodComponentSyntaxImpl(node)
67126736
case .keyPathOptionalComponent:
67136737
self.visitKeyPathOptionalComponentSyntaxImpl(node)
67146738
case .keyPathPropertyComponent:

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

Lines changed: 112 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,20 @@ public struct RawKeyPathComponentListSyntax: RawSyntaxNodeProtocol {
6666
public struct RawKeyPathComponentSyntax: RawSyntaxNodeProtocol {
6767
public enum Component: RawSyntaxNodeProtocol {
6868
case property(RawKeyPathPropertyComponentSyntax)
69+
case method(RawKeyPathMethodComponentSyntax)
6970
case `subscript`(RawKeyPathSubscriptComponentSyntax)
7071
case optional(RawKeyPathOptionalComponentSyntax)
7172

7273
public static func isKindOf(_ raw: RawSyntax) -> Bool {
73-
RawKeyPathPropertyComponentSyntax.isKindOf(raw) || RawKeyPathSubscriptComponentSyntax.isKindOf(raw) || RawKeyPathOptionalComponentSyntax.isKindOf(raw)
74+
RawKeyPathPropertyComponentSyntax.isKindOf(raw) || RawKeyPathMethodComponentSyntax.isKindOf(raw) || RawKeyPathSubscriptComponentSyntax.isKindOf(raw) || RawKeyPathOptionalComponentSyntax.isKindOf(raw)
7475
}
7576

7677
public var raw: RawSyntax {
7778
switch self {
7879
case .property(let node):
7980
return node.raw
81+
case .method(let node):
82+
return node.raw
8083
case .subscript(let node):
8184
return node.raw
8285
case .optional(let node):
@@ -87,6 +90,8 @@ public struct RawKeyPathComponentSyntax: RawSyntaxNodeProtocol {
8790
public init?(_ node: __shared some RawSyntaxNodeProtocol) {
8891
if let node = node.as(RawKeyPathPropertyComponentSyntax.self) {
8992
self = .property(node)
93+
} else if let node = node.as(RawKeyPathMethodComponentSyntax.self) {
94+
self = .method(node)
9095
} else if let node = node.as(RawKeyPathSubscriptComponentSyntax.self) {
9196
self = .subscript(node)
9297
} else if let node = node.as(RawKeyPathOptionalComponentSyntax.self) {
@@ -247,6 +252,112 @@ public struct RawKeyPathExprSyntax: RawExprSyntaxNodeProtocol {
247252
}
248253
}
249254

255+
@_spi(RawSyntax)
256+
public struct RawKeyPathMethodComponentSyntax: RawSyntaxNodeProtocol {
257+
@_spi(RawSyntax)
258+
public var layoutView: RawSyntaxLayoutView {
259+
return raw.layoutView!
260+
}
261+
262+
public static func isKindOf(_ raw: RawSyntax) -> Bool {
263+
return raw.kind == .keyPathMethodComponent
264+
}
265+
266+
public var raw: RawSyntax
267+
268+
init(raw: RawSyntax) {
269+
precondition(Self.isKindOf(raw))
270+
self.raw = raw
271+
}
272+
273+
private init(unchecked raw: RawSyntax) {
274+
self.raw = raw
275+
}
276+
277+
public init?(_ other: some RawSyntaxNodeProtocol) {
278+
guard Self.isKindOf(other.raw) else {
279+
return nil
280+
}
281+
self.init(unchecked: other.raw)
282+
}
283+
284+
public init(
285+
_ unexpectedBeforeDeclName: RawUnexpectedNodesSyntax? = nil,
286+
declName: RawDeclReferenceExprSyntax,
287+
_ unexpectedBetweenDeclNameAndGenericArgumentClause: RawUnexpectedNodesSyntax? = nil,
288+
genericArgumentClause: RawGenericArgumentClauseSyntax?,
289+
_ unexpectedBetweenGenericArgumentClauseAndLeftParen: RawUnexpectedNodesSyntax? = nil,
290+
leftParen: RawTokenSyntax?,
291+
_ unexpectedBetweenLeftParenAndArguments: RawUnexpectedNodesSyntax? = nil,
292+
arguments: RawLabeledExprListSyntax,
293+
_ unexpectedBetweenArgumentsAndRightParen: RawUnexpectedNodesSyntax? = nil,
294+
rightParen: RawTokenSyntax?,
295+
_ unexpectedAfterRightParen: RawUnexpectedNodesSyntax? = nil,
296+
arena: __shared SyntaxArena
297+
) {
298+
let raw = RawSyntax.makeLayout(
299+
kind: .keyPathMethodComponent, uninitializedCount: 11, arena: arena) { layout in
300+
layout.initialize(repeating: nil)
301+
layout[0] = unexpectedBeforeDeclName?.raw
302+
layout[1] = declName.raw
303+
layout[2] = unexpectedBetweenDeclNameAndGenericArgumentClause?.raw
304+
layout[3] = genericArgumentClause?.raw
305+
layout[4] = unexpectedBetweenGenericArgumentClauseAndLeftParen?.raw
306+
layout[5] = leftParen?.raw
307+
layout[6] = unexpectedBetweenLeftParenAndArguments?.raw
308+
layout[7] = arguments.raw
309+
layout[8] = unexpectedBetweenArgumentsAndRightParen?.raw
310+
layout[9] = rightParen?.raw
311+
layout[10] = unexpectedAfterRightParen?.raw
312+
}
313+
self.init(unchecked: raw)
314+
}
315+
316+
public var unexpectedBeforeDeclName: RawUnexpectedNodesSyntax? {
317+
layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
318+
}
319+
320+
public var declName: RawDeclReferenceExprSyntax {
321+
layoutView.children[1].map(RawDeclReferenceExprSyntax.init(raw:))!
322+
}
323+
324+
public var unexpectedBetweenDeclNameAndGenericArgumentClause: RawUnexpectedNodesSyntax? {
325+
layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
326+
}
327+
328+
public var genericArgumentClause: RawGenericArgumentClauseSyntax? {
329+
layoutView.children[3].map(RawGenericArgumentClauseSyntax.init(raw:))
330+
}
331+
332+
public var unexpectedBetweenGenericArgumentClauseAndLeftParen: RawUnexpectedNodesSyntax? {
333+
layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
334+
}
335+
336+
public var leftParen: RawTokenSyntax? {
337+
layoutView.children[5].map(RawTokenSyntax.init(raw:))
338+
}
339+
340+
public var unexpectedBetweenLeftParenAndArguments: RawUnexpectedNodesSyntax? {
341+
layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
342+
}
343+
344+
public var arguments: RawLabeledExprListSyntax {
345+
layoutView.children[7].map(RawLabeledExprListSyntax.init(raw:))!
346+
}
347+
348+
public var unexpectedBetweenArgumentsAndRightParen: RawUnexpectedNodesSyntax? {
349+
layoutView.children[8].map(RawUnexpectedNodesSyntax.init(raw:))
350+
}
351+
352+
public var rightParen: RawTokenSyntax? {
353+
layoutView.children[9].map(RawTokenSyntax.init(raw:))
354+
}
355+
356+
public var unexpectedAfterRightParen: RawUnexpectedNodesSyntax? {
357+
layoutView.children[10].map(RawUnexpectedNodesSyntax.init(raw:))
358+
}
359+
}
360+
250361
@_spi(RawSyntax)
251362
public struct RawKeyPathOptionalComponentSyntax: RawSyntaxNodeProtocol {
252363
@_spi(RawSyntax)

0 commit comments

Comments
 (0)