Skip to content

Commit c347512

Browse files
StevenWong12StevenWong12
committed
Re-generate code with CodeGeneration
1 parent ab7c833 commit c347512

File tree

4 files changed

+49
-48
lines changed

4 files changed

+49
-48
lines changed

‎Sources/IDEUtils/generated/SyntaxClassification.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ extension SyntaxClassification {
8585
return (.buildConfigId, false)
8686
case (.memberTypeIdentifier, 5):
8787
return (.typeIdentifier, false)
88-
case (.operatorDecl, 7):
88+
case (.operatorDecl, 5):
8989
return (.operatorIdentifier, false)
9090
case (.precedenceGroupAssociativity, 1):
9191
return (.keyword, false)
@@ -104,8 +104,6 @@ extension SyntaxClassification {
104104
return (.keyword, false)
105105
case (.ifConfigClause, 3):
106106
return (.buildConfigId, false)
107-
case (.operatorDecl, 3):
108-
return (.attribute, false)
109107
default:
110108
return nil
111109
}

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14233,9 +14233,9 @@ public struct RawOperatorDeclSyntax: RawDeclSyntaxNodeProtocol {
1423314233
}
1423414234

1423514235
public init(
14236-
_ unexpectedBeforeModifier: RawUnexpectedNodesSyntax? = nil,
14237-
operatorModifier: RawTokenSyntax,
14238-
_ unexpectedBetweenModifiersAndOperatorKeyword: RawUnexpectedNodesSyntax? = nil,
14236+
_ unexpectedBeforeOperatorModifier: RawUnexpectedNodesSyntax? = nil,
14237+
operatorModifier: RawTokenSyntax,
14238+
_ unexpectedBetweenOperatorModifierAndOperatorKeyword: RawUnexpectedNodesSyntax? = nil,
1423914239
operatorKeyword: RawTokenSyntax,
1424014240
_ unexpectedBetweenOperatorKeywordAndIdentifier: RawUnexpectedNodesSyntax? = nil,
1424114241
identifier: RawTokenSyntax,
@@ -14247,9 +14247,9 @@ public struct RawOperatorDeclSyntax: RawDeclSyntaxNodeProtocol {
1424714247
let raw = RawSyntax.makeLayout(
1424814248
kind: .operatorDecl, uninitializedCount: 9, arena: arena) { layout in
1424914249
layout.initialize(repeating: nil)
14250-
layout[0] = unexpectedBeforeModifier?.raw
14250+
layout[0] = unexpectedBeforeOperatorModifier?.raw
1425114251
layout[1] = operatorModifier.raw
14252-
layout[2] = unexpectedBetweenModifiersAndOperatorKeyword?.raw
14252+
layout[2] = unexpectedBetweenOperatorModifierAndOperatorKeyword?.raw
1425314253
layout[3] = operatorKeyword.raw
1425414254
layout[4] = unexpectedBetweenOperatorKeywordAndIdentifier?.raw
1425514255
layout[5] = identifier.raw
@@ -14260,16 +14260,15 @@ public struct RawOperatorDeclSyntax: RawDeclSyntaxNodeProtocol {
1426014260
self.init(unchecked: raw)
1426114261
}
1426214262

14263-
14264-
public var unexpectedBeforeModifier: RawUnexpectedNodesSyntax? {
14263+
public var unexpectedBeforeOperatorModifier: RawUnexpectedNodesSyntax? {
1426514264
layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
1426614265
}
1426714266

1426814267
public var operatorModifier: RawTokenSyntax {
1426914268
layoutView.children[1].map(RawTokenSyntax.init(raw:))!
1427014269
}
1427114270

14272-
public var unexpectedBetweenModifiersAndOperatorKeyword: RawUnexpectedNodesSyntax? {
14271+
public var unexpectedBetweenOperatorModifierAndOperatorKeyword: RawUnexpectedNodesSyntax? {
1427314272
layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
1427414273
}
1427514274

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

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,12 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
227227
case .accessPathComponent:
228228
assert(layout.count == 5)
229229
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
230-
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [.tokenKind(.identifier)]))
230+
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [
231+
.tokenKind(.identifier),
232+
.tokenKind(.binaryOperator),
233+
.tokenKind(.prefixOperator),
234+
.tokenKind(.postfixOperator)
235+
]))
231236
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
232237
assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax?.self, tokenChoices: [.tokenKind(.period)]))
233238
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
@@ -830,7 +835,13 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
830835
case .declName:
831836
assert(layout.count == 5)
832837
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
833-
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [.tokenKind(.identifier), .tokenKind(.prefixOperator), .keyword("init")]))
838+
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [
839+
.tokenKind(.identifier),
840+
.tokenKind(.binaryOperator),
841+
.keyword("init"),
842+
.keyword("self"),
843+
.keyword("Self")
844+
]))
834845
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
835846
assertNoError(kind, 3, verify(layout[3], as: RawDeclNameArgumentsSyntax?.self))
836847
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
@@ -951,7 +962,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
951962
case .differentiableAttributeArguments:
952963
assert(layout.count == 11)
953964
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
954-
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax?.self, tokenChoices: [.keyword("forward"), .keyword("reverse"), .keyword("linear")]))
965+
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax?.self, tokenChoices: [.keyword("_forward"), .keyword("reverse"), .keyword("_linear")]))
955966
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
956967
assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax?.self, tokenChoices: [.tokenKind(.comma)]))
957968
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
@@ -1545,14 +1556,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
15451556
case .labeledSpecializeEntry:
15461557
assert(layout.count == 9)
15471558
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
1548-
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [
1549-
.tokenKind(.identifier),
1550-
.keyword("available"),
1551-
.keyword("exported"),
1552-
.keyword("kind"),
1553-
.keyword("spi"),
1554-
.keyword("spiModule")
1555-
]))
1559+
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self))
15561560
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
15571561
assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax.self, tokenChoices: [.tokenKind(.colon)]))
15581562
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
@@ -1776,7 +1780,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
17761780
case .objCSelectorPiece:
17771781
assert(layout.count == 5)
17781782
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
1779-
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax?.self, tokenChoices: [.tokenKind(.identifier)]))
1783+
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax?.self))
17801784
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
17811785
assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax?.self, tokenChoices: [.tokenKind(.colon)]))
17821786
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
@@ -1796,7 +1800,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
17961800
case .operatorDecl:
17971801
assert(layout.count == 9)
17981802
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
1799-
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices:[.keyword("prefix"), .keyword("postfix"), .keyword("infix")]))
1803+
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [.keyword("prefix"), .keyword("postfix"), .keyword("infix")]))
18001804
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
18011805
assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax.self, tokenChoices: [.keyword("operator")]))
18021806
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
@@ -2065,9 +2069,10 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
20652069
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
20662070
assertNoError(kind, 5, verify(layout[5], as: RawTokenSyntax.self, tokenChoices: [
20672071
.tokenKind(.identifier),
2068-
.tokenKind(.binaryOperator),
2069-
.tokenKind(.prefixOperator),
2070-
.tokenKind(.postfixOperator)
2072+
.keyword("self"),
2073+
.keyword("Self"),
2074+
.keyword("init"),
2075+
.tokenKind(.binaryOperator)
20712076
]))
20722077
assertNoError(kind, 6, verify(layout[6], as: RawUnexpectedNodesSyntax?.self))
20732078
assertNoError(kind, 7, verify(layout[7], as: RawDeclNameArgumentsSyntax?.self))

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

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4892,10 +4892,10 @@ public struct OperatorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
48924892
}
48934893

48944894
public init(
4895-
leadingTrivia: Trivia? = nil,
4896-
_ unexpectedBeforeModifier: UnexpectedNodesSyntax? = nil,
4897-
operatorModifier: TokenSyntax,
4898-
_ unexpectedBetweenModifiersAndOperatorKeyword: UnexpectedNodesSyntax? = nil,
4895+
leadingTrivia: Trivia? = nil,
4896+
_ unexpectedBeforeOperatorModifier: UnexpectedNodesSyntax? = nil,
4897+
operatorModifier: TokenSyntax,
4898+
_ unexpectedBetweenOperatorModifierAndOperatorKeyword: UnexpectedNodesSyntax? = nil,
48994899
operatorKeyword: TokenSyntax = .keyword(.operator),
49004900
_ unexpectedBetweenOperatorKeywordAndIdentifier: UnexpectedNodesSyntax? = nil,
49014901
identifier: TokenSyntax,
@@ -4908,9 +4908,9 @@ public struct OperatorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
49084908
// Extend the lifetime of all parameters so their arenas don't get destroyed
49094909
// before they can be added as children of the new arena.
49104910
let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
4911-
unexpectedBeforeModifier,
4912-
operatorModifier,
4913-
unexpectedBetweenModifiersAndOperatorKeyword,
4911+
unexpectedBeforeOperatorModifier,
4912+
operatorModifier,
4913+
unexpectedBetweenOperatorModifierAndOperatorKeyword,
49144914
operatorKeyword,
49154915
unexpectedBetweenOperatorKeywordAndIdentifier,
49164916
identifier,
@@ -4919,9 +4919,9 @@ public struct OperatorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
49194919
unexpectedAfterOperatorPrecedenceAndTypes
49204920
))) {(arena, _) in
49214921
let layout: [RawSyntax?] = [
4922-
unexpectedBeforeModifier?.raw,
4923-
operatorModifier.raw,
4924-
unexpectedBetweenModifiersAndOperatorKeyword?.raw,
4922+
unexpectedBeforeOperatorModifier?.raw,
4923+
operatorModifier.raw,
4924+
unexpectedBetweenOperatorModifierAndOperatorKeyword?.raw,
49254925
operatorKeyword.raw,
49264926
unexpectedBetweenOperatorKeywordAndIdentifier?.raw,
49274927
identifier.raw,
@@ -4941,7 +4941,7 @@ public struct OperatorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
49414941
self.init(data)
49424942
}
49434943

4944-
public var unexpectedBeforeModifier: UnexpectedNodesSyntax? {
4944+
public var unexpectedBeforeOperatorModifier: UnexpectedNodesSyntax? {
49454945
get {
49464946
return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
49474947
}
@@ -4950,18 +4950,17 @@ public struct OperatorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
49504950
}
49514951
}
49524952

4953-
/// The declaration modifiers applied to the 'operator' declaration.
4953+
/// The declaration modifier applied to the 'operator' declaration.
49544954
public var operatorModifier: TokenSyntax {
49554955
get {
4956-
return data.child(at: 1, parent: Syntax(self)).map(TokenSyntax.init)!
4956+
return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
49574957
}
49584958
set(value) {
49594959
self = OperatorDeclSyntax(data.replacingChild(at: 1, with: value.raw, arena: SyntaxArena()))
49604960
}
49614961
}
49624962

4963-
4964-
public var unexpectedBetweenModifiersAndOperatorKeyword: UnexpectedNodesSyntax? {
4963+
public var unexpectedBetweenOperatorModifierAndOperatorKeyword: UnexpectedNodesSyntax? {
49654964
get {
49664965
return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
49674966
}
@@ -5027,9 +5026,9 @@ public struct OperatorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
50275026

50285027
public static var structure: SyntaxNodeStructure {
50295028
return .layout([
5030-
\Self.unexpectedBeforeModifier,
5031-
\Self.operatorModifier,
5032-
\Self.unexpectedBetweenModifiersAndOperatorKeyword,
5029+
\Self.unexpectedBeforeOperatorModifier,
5030+
\Self.operatorModifier,
5031+
\Self.unexpectedBetweenOperatorModifierAndOperatorKeyword,
50335032
\Self.operatorKeyword,
50345033
\Self.unexpectedBetweenOperatorKeywordAndIdentifier,
50355034
\Self.identifier,
@@ -5068,9 +5067,9 @@ public struct OperatorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
50685067
extension OperatorDeclSyntax: CustomReflectable {
50695068
public var customMirror: Mirror {
50705069
return Mirror(self, children: [
5071-
"unexpectedBeforeModifier": unexpectedBeforeModifier.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any ,
5072-
"operatorModifier":Syntax(operatorModifier).asProtocol(SyntaxProtocol.self),
5073-
"unexpectedBetweenModifiersAndOperatorKeyword": unexpectedBetweenModifiersAndOperatorKeyword.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any ,
5070+
"unexpectedBeforeOperatorModifier": unexpectedBeforeOperatorModifier.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any ,
5071+
"operatorModifier": Syntax(operatorModifier).asProtocol(SyntaxProtocol.self),
5072+
"unexpectedBetweenOperatorModifierAndOperatorKeyword": unexpectedBetweenOperatorModifierAndOperatorKeyword.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any ,
50745073
"operatorKeyword": Syntax(operatorKeyword).asProtocol(SyntaxProtocol.self),
50755074
"unexpectedBetweenOperatorKeywordAndIdentifier": unexpectedBetweenOperatorKeywordAndIdentifier.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any ,
50765075
"identifier": Syntax(identifier).asProtocol(SyntaxProtocol.self),

0 commit comments

Comments
 (0)