Skip to content

Commit 82b5683

Browse files
ahoppenahoppen
authored
Merge pull request #1517 from stevapple/fix-for-in
Address default parameter regressions and add tests for `ForInStmtSyntax`
2 parents a2e596a + 117b293 commit 82b5683

File tree

18 files changed

+160
-120
lines changed

18 files changed

+160
-120
lines changed

‎CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public let KEYWORDS: [KeywordSpec] = [
9696
KeywordSpec("autoclosure"),
9797
KeywordSpec("availability"),
9898
KeywordSpec("available"),
99-
KeywordSpec("await"),
99+
KeywordSpec("await", requiresTrailingSpace: true),
100100
KeywordSpec("backDeployed"),
101101
KeywordSpec("before"),
102102
KeywordSpec("block"),

‎CodeGeneration/Sources/SyntaxSupport/StmtNodes.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,18 +290,17 @@ public let STMT_NODES: [Node] = [
290290
),
291291
Child(
292292
name: "TryKeyword",
293-
kind: .node(kind: "TryToken"),
293+
kind: .token(choices: [.keyword(text: "try")]),
294294
isOptional: true
295295
),
296296
Child(
297297
name: "AwaitKeyword",
298298
kind: .token(choices: [.keyword(text: "await")]),
299-
isOptional: true,
300-
classification: "Keyword"
299+
isOptional: true
301300
),
302301
Child(
303302
name: "CaseKeyword",
304-
kind: .node(kind: "CaseToken"),
303+
kind: .token(choices: [.keyword(text: "case")]),
305304
isOptional: true
306305
),
307306
Child(

‎CodeGeneration/Sources/Utils/SyntaxBuildableChild.swift

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,34 @@ public extension Child {
4545
flattened(indentedDocumentation: description ?? "")
4646
}
4747

48-
var defaultInitialization: ExprSyntax? {
49-
switch kind {
50-
case .token(choices: let choices, requiresLeadingSpace: _, requiresTrailingSpace: _):
51-
if choices.count == 1, case .keyword(text: let text) = choices.first {
52-
var textChoice = text
53-
if textChoice == "init" {
54-
textChoice = "`init`"
55-
}
56-
return ExprSyntax(".keyword(.\(raw: textChoice))")
57-
} else {
58-
return type.defaultInitialization
59-
}
60-
default:
61-
return type.defaultInitialization
48+
/// If the child node has a default value, return an expression of the form
49+
/// ` = default_value` that can be used as the default value to for a
50+
/// function parameter. Otherwise, return `nil`.
51+
var defaultInitialization: InitializerClauseSyntax? {
52+
if isOptional || isUnexpectedNodes {
53+
return InitializerClauseSyntax(value: NilLiteralExprSyntax())
54+
}
55+
guard let token = token, isToken else {
56+
return type.defaultValue.map { InitializerClauseSyntax(value: $0) }
57+
}
58+
if token.isKeyword {
59+
return InitializerClauseSyntax(value: ExprSyntax(".\(raw: token.swiftKind)()"))
60+
}
61+
if token.text != nil {
62+
return InitializerClauseSyntax(value: ExprSyntax(".\(raw: token.swiftKind)Token()"))
63+
}
64+
guard case .token(let choices, _, _) = kind, choices.count == 1, token.associatedValueClass != nil else {
65+
return nil
66+
}
67+
var textChoice: String
68+
switch choices[0] {
69+
case .keyword(let text), .token(let text):
70+
textChoice = text
71+
}
72+
if textChoice == "init" {
73+
textChoice = "`init`"
6274
}
75+
return InitializerClauseSyntax(value: ExprSyntax(".\(raw: token.swiftKind)(.\(raw: textChoice))"))
6376
}
6477

6578
/// If this node is a token that can't contain arbitrary text, generate a Swift

‎CodeGeneration/Sources/Utils/SyntaxBuildableNode.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public extension Node {
5050

5151
/// Assuming this node has a single child without a default value, that child.
5252
var singleNonDefaultedChild: Child {
53-
let nonDefaultedParams = children.filter { $0.type.defaultInitialization == nil }
53+
let nonDefaultedParams = children.filter { $0.defaultInitialization == nil }
5454
precondition(nonDefaultedParams.count == 1)
5555
return nonDefaultedParams[0]
5656
}

‎CodeGeneration/Sources/Utils/SyntaxBuildableType.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,9 @@ public struct SyntaxBuildableType: Hashable {
5050
}
5151

5252
/// If the type has a default value (because it is optional or a token
53-
/// with fixed test), return an expression of the form ` = defaultValue`
54-
/// that can be used as the default value for a function parameter.
55-
/// Otherwise, return the empty string.
56-
public var defaultInitialization: ExprSyntax? {
53+
/// with fixed test), return an expression that can be used as the
54+
/// default value for a function parameter. Otherwise, return `nil`.
55+
public var defaultValue: ExprSyntax? {
5756
if isOptional {
5857
return ExprSyntax(NilLiteralExprSyntax())
5958
} else if let token = token {

‎CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxNodesFile.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ let rawSyntaxNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
197197
secondName: .identifier(child.swiftName),
198198
colon: .colonToken(),
199199
type: child.rawParameterType,
200-
defaultArgument: child.isUnexpectedNodes ? child.defaultInitialization.map { InitializerClauseSyntax(value: $0) } : nil
200+
defaultArgument: child.isUnexpectedNodes ? child.defaultInitialization : nil
201201
)
202202
}
203203

‎CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxNodeFile.swift

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -438,57 +438,3 @@ fileprivate extension Node {
438438
}
439439
}
440440
}
441-
442-
fileprivate extension Child {
443-
/// If the type has a default value, return an expression of the form
444-
/// ` = default_value` that can be used as the default value to for a
445-
/// function parameter. Otherwise, return an empty string.
446-
var defaultInitialization: InitializerClauseSyntax? {
447-
// Note that this should be Optional<BaseType>.none for defaulted generic,
448-
// but that doesn't work in Swift 5.6. To keep source compatibility with
449-
// previous SwiftSyntax, we instead create a second initializer that uses
450-
// `Missing<Node>` and defaults that to `nil` instead (and `Missing` is
451-
// used so that they can't be implicitly converted from a literal).
452-
453-
if isOptional || isUnexpectedNodes {
454-
return InitializerClauseSyntax(value: NilLiteralExprSyntax())
455-
}
456-
457-
guard let token = token, isToken else {
458-
return nil
459-
}
460-
461-
if token.isKeyword {
462-
return InitializerClauseSyntax(value: ExprSyntax(".\(raw: token.swiftKind)()"))
463-
}
464-
465-
if token.text != nil {
466-
return InitializerClauseSyntax(value: ExprSyntax(".\(raw: token.swiftKind)Token()"))
467-
}
468-
469-
guard case .token(let choices, _, _) = kind else {
470-
return nil
471-
}
472-
473-
guard choices.count == 1 else {
474-
return nil
475-
}
476-
477-
var textChoice: String
478-
479-
switch choices[0] {
480-
case .keyword(let text),
481-
.token(let text):
482-
textChoice = text
483-
}
484-
485-
if token.associatedValueClass != nil {
486-
if textChoice == "init" {
487-
textChoice = "`init`"
488-
}
489-
return InitializerClauseSyntax(value: ExprSyntax(".\(raw: token.swiftKind)(.\(raw: textChoice))"))
490-
} else {
491-
return InitializerClauseSyntax(value: ExprSyntax(#".\#(raw: token.swiftKind)("\#(raw: textChoice)")"#))
492-
}
493-
}
494-
}

‎CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/BuildableNodesFile.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private func createConvenienceInitializer(node: Node) throws -> InitializerDeclS
8383
firstName: .identifier(child.swiftName),
8484
colon: .colonToken(),
8585
type: child.parameterType,
86-
defaultArgument: child.defaultInitialization.map { InitializerClauseSyntax(value: $0) }
86+
defaultArgument: child.defaultInitialization
8787
)
8888
)
8989
}

‎Sources/IDEUtils/generated/SyntaxClassification.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ extension SyntaxClassification {
7979
return (.stringInterpolationAnchor, true)
8080
case \ExpressionSegmentSyntax.rightParen:
8181
return (.stringInterpolationAnchor, true)
82-
case \ForInStmtSyntax.awaitKeyword:
83-
return (.keyword, false)
8482
case \IfConfigClauseSyntax.poundKeyword:
8583
return (.buildConfigId, false)
8684
case \IfConfigClauseSyntax.condition:

‎Sources/SwiftBasicFormat/generated/BasicFormat.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,8 @@ open class BasicFormat: SyntaxRewriter {
285285
return true
286286
case .keyword(.async):
287287
return true
288+
case .keyword(.await):
289+
return true
288290
case .keyword(.`break`):
289291
return true
290292
case .keyword(.`case`):

‎Sources/SwiftParser/Statements.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,6 @@ extension Parser {
614614
public mutating func parseForEachStatement(forHandle: RecoveryConsumptionHandle) -> RawForInStmtSyntax {
615615
let (unexpectedBeforeForKeyword, forKeyword) = self.eat(forHandle)
616616
let tryKeyword = self.consume(if: .keyword(.try))
617-
618617
let awaitKeyword = self.consume(if: .keyword(.await))
619618

620619
// Parse the pattern. This is either 'case <refutable pattern>' or just a

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,11 +1200,11 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
12001200
assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
12011201
assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [.keyword("for")]))
12021202
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
1203-
assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax?.self))
1203+
assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax?.self, tokenChoices: [.keyword("try")]))
12041204
assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
12051205
assertNoError(kind, 5, verify(layout[5], as: RawTokenSyntax?.self, tokenChoices: [.keyword("await")]))
12061206
assertNoError(kind, 6, verify(layout[6], as: RawUnexpectedNodesSyntax?.self))
1207-
assertNoError(kind, 7, verify(layout[7], as: RawTokenSyntax?.self))
1207+
assertNoError(kind, 7, verify(layout[7], as: RawTokenSyntax?.self, tokenChoices: [.keyword("case")]))
12081208
assertNoError(kind, 8, verify(layout[8], as: RawUnexpectedNodesSyntax?.self))
12091209
assertNoError(kind, 9, verify(layout[9], as: RawPatternSyntax.self))
12101210
assertNoError(kind, 10, verify(layout[10], as: RawUnexpectedNodesSyntax?.self))

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ public struct ActorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
300300
_ unexpectedBetweenModifiersAndActorKeyword: UnexpectedNodesSyntax? = nil,
301301
actorKeyword: TokenSyntax = .keyword(.actor),
302302
_ unexpectedBetweenActorKeywordAndIdentifier: UnexpectedNodesSyntax? = nil,
303-
identifier: TokenSyntax = .identifier("IdentifierToken"),
303+
identifier: TokenSyntax,
304304
_ unexpectedBetweenIdentifierAndGenericParameterClause: UnexpectedNodesSyntax? = nil,
305305
genericParameterClause: GenericParameterClauseSyntax? = nil,
306306
_ unexpectedBetweenGenericParameterClauseAndInheritanceClause: UnexpectedNodesSyntax? = nil,
@@ -633,7 +633,7 @@ public struct AssociatedtypeDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
633633
_ unexpectedBetweenModifiersAndAssociatedtypeKeyword: UnexpectedNodesSyntax? = nil,
634634
associatedtypeKeyword: TokenSyntax = .keyword(.associatedtype),
635635
_ unexpectedBetweenAssociatedtypeKeywordAndIdentifier: UnexpectedNodesSyntax? = nil,
636-
identifier: TokenSyntax = .identifier("IdentifierToken"),
636+
identifier: TokenSyntax,
637637
_ unexpectedBetweenIdentifierAndInheritanceClause: UnexpectedNodesSyntax? = nil,
638638
inheritanceClause: TypeInheritanceClauseSyntax? = nil,
639639
_ unexpectedBetweenInheritanceClauseAndInitializer: UnexpectedNodesSyntax? = nil,
@@ -938,7 +938,7 @@ public struct ClassDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
938938
_ unexpectedBetweenModifiersAndClassKeyword: UnexpectedNodesSyntax? = nil,
939939
classKeyword: TokenSyntax = .keyword(.class),
940940
_ unexpectedBetweenClassKeywordAndIdentifier: UnexpectedNodesSyntax? = nil,
941-
identifier: TokenSyntax = .identifier("IdentifierToken"),
941+
identifier: TokenSyntax,
942942
_ unexpectedBetweenIdentifierAndGenericParameterClause: UnexpectedNodesSyntax? = nil,
943943
genericParameterClause: GenericParameterClauseSyntax? = nil,
944944
_ unexpectedBetweenGenericParameterClauseAndInheritanceClause: UnexpectedNodesSyntax? = nil,
@@ -1486,7 +1486,7 @@ public struct EditorPlaceholderDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
14861486
public init(
14871487
leadingTrivia: Trivia? = nil,
14881488
_ unexpectedBeforeIdentifier: UnexpectedNodesSyntax? = nil,
1489-
identifier: TokenSyntax = .identifier("IdentifierToken"),
1489+
identifier: TokenSyntax,
14901490
_ unexpectedAfterIdentifier: UnexpectedNodesSyntax? = nil,
14911491
trailingTrivia: Trivia? = nil
14921492

@@ -1822,7 +1822,7 @@ public struct EnumDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
18221822
_ unexpectedBetweenModifiersAndEnumKeyword: UnexpectedNodesSyntax? = nil,
18231823
enumKeyword: TokenSyntax = .keyword(.enum),
18241824
_ unexpectedBetweenEnumKeywordAndIdentifier: UnexpectedNodesSyntax? = nil,
1825-
identifier: TokenSyntax = .identifier("IdentifierToken"),
1825+
identifier: TokenSyntax,
18261826
_ unexpectedBetweenIdentifierAndGenericParameters: UnexpectedNodesSyntax? = nil,
18271827
genericParameters: GenericParameterClauseSyntax? = nil,
18281828
_ unexpectedBetweenGenericParametersAndInheritanceClause: UnexpectedNodesSyntax? = nil,
@@ -3563,7 +3563,7 @@ public struct MacroDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
35633563
_ unexpectedBetweenModifiersAndMacroKeyword: UnexpectedNodesSyntax? = nil,
35643564
macroKeyword: TokenSyntax = .keyword(.macro),
35653565
_ unexpectedBetweenMacroKeywordAndIdentifier: UnexpectedNodesSyntax? = nil,
3566-
identifier: TokenSyntax = .identifier("IdentifierToken"),
3566+
identifier: TokenSyntax,
35673567
_ unexpectedBetweenIdentifierAndGenericParameterClause: UnexpectedNodesSyntax? = nil,
35683568
genericParameterClause: GenericParameterClauseSyntax? = nil,
35693569
_ unexpectedBetweenGenericParameterClauseAndSignature: UnexpectedNodesSyntax? = nil,
@@ -3892,7 +3892,7 @@ public struct MacroExpansionDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
38923892
_ unexpectedBeforePoundToken: UnexpectedNodesSyntax? = nil,
38933893
poundToken: TokenSyntax = .poundToken(),
38943894
_ unexpectedBetweenPoundTokenAndMacro: UnexpectedNodesSyntax? = nil,
3895-
macro: TokenSyntax = .identifier("IdentifierToken"),
3895+
macro: TokenSyntax,
38963896
_ unexpectedBetweenMacroAndGenericArguments: UnexpectedNodesSyntax? = nil,
38973897
genericArguments: GenericArgumentClauseSyntax? = nil,
38983898
_ unexpectedBetweenGenericArgumentsAndLeftParen: UnexpectedNodesSyntax? = nil,
@@ -4830,7 +4830,7 @@ public struct PrecedenceGroupDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
48304830
_ unexpectedBetweenModifiersAndPrecedencegroupKeyword: UnexpectedNodesSyntax? = nil,
48314831
precedencegroupKeyword: TokenSyntax = .keyword(.precedencegroup),
48324832
_ unexpectedBetweenPrecedencegroupKeywordAndIdentifier: UnexpectedNodesSyntax? = nil,
4833-
identifier: TokenSyntax = .identifier("IdentifierToken"),
4833+
identifier: TokenSyntax,
48344834
_ unexpectedBetweenIdentifierAndLeftBrace: UnexpectedNodesSyntax? = nil,
48354835
leftBrace: TokenSyntax = .leftBraceToken(),
48364836
_ unexpectedBetweenLeftBraceAndGroupAttributes: UnexpectedNodesSyntax? = nil,
@@ -5158,7 +5158,7 @@ public struct ProtocolDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
51585158
_ unexpectedBetweenModifiersAndProtocolKeyword: UnexpectedNodesSyntax? = nil,
51595159
protocolKeyword: TokenSyntax = .keyword(.protocol),
51605160
_ unexpectedBetweenProtocolKeywordAndIdentifier: UnexpectedNodesSyntax? = nil,
5161-
identifier: TokenSyntax = .identifier("IdentifierToken"),
5161+
identifier: TokenSyntax,
51625162
_ unexpectedBetweenIdentifierAndPrimaryAssociatedTypeClause: UnexpectedNodesSyntax? = nil,
51635163
primaryAssociatedTypeClause: PrimaryAssociatedTypeClauseSyntax? = nil,
51645164
_ unexpectedBetweenPrimaryAssociatedTypeClauseAndInheritanceClause: UnexpectedNodesSyntax? = nil,
@@ -5491,7 +5491,7 @@ public struct StructDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
54915491
_ unexpectedBetweenModifiersAndStructKeyword: UnexpectedNodesSyntax? = nil,
54925492
structKeyword: TokenSyntax = .keyword(.struct),
54935493
_ unexpectedBetweenStructKeywordAndIdentifier: UnexpectedNodesSyntax? = nil,
5494-
identifier: TokenSyntax = .identifier("IdentifierToken"),
5494+
identifier: TokenSyntax,
54955495
_ unexpectedBetweenIdentifierAndGenericParameterClause: UnexpectedNodesSyntax? = nil,
54965496
genericParameterClause: GenericParameterClauseSyntax? = nil,
54975497
_ unexpectedBetweenGenericParameterClauseAndInheritanceClause: UnexpectedNodesSyntax? = nil,
@@ -6199,7 +6199,7 @@ public struct TypealiasDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
61996199
_ unexpectedBetweenModifiersAndTypealiasKeyword: UnexpectedNodesSyntax? = nil,
62006200
typealiasKeyword: TokenSyntax = .keyword(.typealias),
62016201
_ unexpectedBetweenTypealiasKeywordAndIdentifier: UnexpectedNodesSyntax? = nil,
6202-
identifier: TokenSyntax = .identifier("IdentifierToken"),
6202+
identifier: TokenSyntax,
62036203
_ unexpectedBetweenIdentifierAndGenericParameterClause: UnexpectedNodesSyntax? = nil,
62046204
genericParameterClause: GenericParameterClauseSyntax? = nil,
62056205
_ unexpectedBetweenGenericParameterClauseAndInitializer: UnexpectedNodesSyntax? = nil,

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ public struct BinaryOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
733733
public init(
734734
leadingTrivia: Trivia? = nil,
735735
_ unexpectedBeforeOperatorToken: UnexpectedNodesSyntax? = nil,
736-
operatorToken: TokenSyntax = .binaryOperator("BinaryOperatorToken"),
736+
operatorToken: TokenSyntax,
737737
_ unexpectedAfterOperatorToken: UnexpectedNodesSyntax? = nil,
738738
trailingTrivia: Trivia? = nil
739739

@@ -1517,7 +1517,7 @@ public struct EditorPlaceholderExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
15171517
public init(
15181518
leadingTrivia: Trivia? = nil,
15191519
_ unexpectedBeforeIdentifier: UnexpectedNodesSyntax? = nil,
1520-
identifier: TokenSyntax = .identifier("IdentifierToken"),
1520+
identifier: TokenSyntax,
15211521
_ unexpectedAfterIdentifier: UnexpectedNodesSyntax? = nil,
15221522
trailingTrivia: Trivia? = nil
15231523

@@ -1603,7 +1603,7 @@ public struct FloatLiteralExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
16031603
public init(
16041604
leadingTrivia: Trivia? = nil,
16051605
_ unexpectedBeforeFloatingDigits: UnexpectedNodesSyntax? = nil,
1606-
floatingDigits: TokenSyntax = .floatingLiteral("FloatingLiteralToken"),
1606+
floatingDigits: TokenSyntax,
16071607
_ unexpectedAfterFloatingDigits: UnexpectedNodesSyntax? = nil,
16081608
trailingTrivia: Trivia? = nil
16091609

@@ -2774,7 +2774,7 @@ public struct IntegerLiteralExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
27742774
public init(
27752775
leadingTrivia: Trivia? = nil,
27762776
_ unexpectedBeforeDigits: UnexpectedNodesSyntax? = nil,
2777-
digits: TokenSyntax = .integerLiteral("IntegerLiteralToken"),
2777+
digits: TokenSyntax,
27782778
_ unexpectedAfterDigits: UnexpectedNodesSyntax? = nil,
27792779
trailingTrivia: Trivia? = nil
27802780

@@ -3226,7 +3226,7 @@ public struct MacroExpansionExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
32263226
_ unexpectedBeforePoundToken: UnexpectedNodesSyntax? = nil,
32273227
poundToken: TokenSyntax = .poundToken(),
32283228
_ unexpectedBetweenPoundTokenAndMacro: UnexpectedNodesSyntax? = nil,
3229-
macro: TokenSyntax = .identifier("IdentifierToken"),
3229+
macro: TokenSyntax,
32303230
_ unexpectedBetweenMacroAndGenericArguments: UnexpectedNodesSyntax? = nil,
32313231
genericArguments: GenericArgumentClauseSyntax? = nil,
32323232
_ unexpectedBetweenGenericArgumentsAndLeftParen: UnexpectedNodesSyntax? = nil,
@@ -4597,7 +4597,7 @@ public struct PostfixUnaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
45974597
_ unexpectedBeforeExpression: UnexpectedNodesSyntax? = nil,
45984598
expression: E,
45994599
_ unexpectedBetweenExpressionAndOperatorToken: UnexpectedNodesSyntax? = nil,
4600-
operatorToken: TokenSyntax = .postfixOperator("PostfixOperatorToken"),
4600+
operatorToken: TokenSyntax,
46014601
_ unexpectedAfterOperatorToken: UnexpectedNodesSyntax? = nil,
46024602
trailingTrivia: Trivia? = nil
46034603

@@ -4853,7 +4853,7 @@ public struct RegexLiteralExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
48534853
_ unexpectedBetweenOpeningPoundsAndOpenSlash: UnexpectedNodesSyntax? = nil,
48544854
openSlash: TokenSyntax = .regexSlashToken(),
48554855
_ unexpectedBetweenOpenSlashAndRegexPattern: UnexpectedNodesSyntax? = nil,
4856-
regexPattern: TokenSyntax = .regexLiteralPattern("RegexLiteralPatternToken"),
4856+
regexPattern: TokenSyntax,
48574857
_ unexpectedBetweenRegexPatternAndCloseSlash: UnexpectedNodesSyntax? = nil,
48584858
closeSlash: TokenSyntax = .regexSlashToken(),
48594859
_ unexpectedBetweenCloseSlashAndClosingPounds: UnexpectedNodesSyntax? = nil,

0 commit comments

Comments
 (0)