From c6aa9b80d548c89f2accfdc600c21cf66f605baa Mon Sep 17 00:00:00 2001 From: Kim de Vos Date: Wed, 26 Apr 2023 14:57:05 +0200 Subject: [PATCH 1/3] Use HEAD as revision --- CodeGeneration/Package.swift | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/CodeGeneration/Package.swift b/CodeGeneration/Package.swift index 200a65fafb8..437924a839e 100644 --- a/CodeGeneration/Package.swift +++ b/CodeGeneration/Package.swift @@ -1,6 +1,7 @@ // swift-tools-version:5.7 import PackageDescription +import Foundation let package = Package( name: "CodeGeneration", @@ -11,8 +12,7 @@ let package = Package( .executable(name: "generate-swiftsyntax", targets: ["generate-swiftsyntax"]) ], dependencies: [ - .package(url: "https://github.com/apple/swift-syntax.git", revision: "c7087adb193b26f02b59d21cd06d17ec202d1bf5"), - .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.2.2"), + .package(url: "..", revision: "HEAD") ], targets: [ .executableTarget( @@ -41,3 +41,14 @@ let package = Package( ), ] ) + +if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil { + // Building standalone. + package.dependencies += [ + .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.2.2")) + ] +} else { + package.dependencies += [ + .package(path: "../../swift-argument-parser") + ] +} From 222563fb20943eae51dd783c13123d4c1495584a Mon Sep 17 00:00:00 2001 From: Kim de Vos Date: Thu, 27 Apr 2023 08:34:55 +0200 Subject: [PATCH 2/3] Generate code --- CodeGeneration/Package.swift | 2 +- .../generated/SyntaxCollections.swift | 282 +++++++++--------- .../generated/SyntaxRewriter.swift | 4 +- Sources/SwiftSyntax/generated/Tokens.swift | 98 +++--- .../generated/raw/RawSyntaxNodes.swift | 188 ++++++------ .../generated/raw/RawSyntaxValidation.swift | 76 ++--- .../syntaxNodes/SyntaxExprNodes.swift | 6 +- .../generated/syntaxNodes/SyntaxNodes.swift | 10 +- .../syntaxNodes/SyntaxStmtNodes.swift | 2 +- 9 files changed, 334 insertions(+), 334 deletions(-) diff --git a/CodeGeneration/Package.swift b/CodeGeneration/Package.swift index 437924a839e..07dccfc618d 100644 --- a/CodeGeneration/Package.swift +++ b/CodeGeneration/Package.swift @@ -45,7 +45,7 @@ let package = Package( if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil { // Building standalone. package.dependencies += [ - .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.2.2")) + .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.2.2") ] } else { package.dependencies += [ diff --git a/Sources/SwiftSyntax/generated/SyntaxCollections.swift b/Sources/SwiftSyntax/generated/SyntaxCollections.swift index f185e513707..d6a41e4aecb 100644 --- a/Sources/SwiftSyntax/generated/SyntaxCollections.swift +++ b/Sources/SwiftSyntax/generated/SyntaxCollections.swift @@ -57,8 +57,8 @@ public struct AccessPathSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.accessPath, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -226,7 +226,7 @@ extension AccessPathSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -266,8 +266,8 @@ public struct AccessorListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.accessorList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -435,7 +435,7 @@ extension AccessorListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -475,8 +475,8 @@ public struct ArrayElementListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.arrayElementList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -644,7 +644,7 @@ extension ArrayElementListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -727,8 +727,8 @@ public struct AttributeListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.attributeList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -896,7 +896,7 @@ extension AttributeListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -936,8 +936,8 @@ public struct AvailabilitySpecListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.availabilitySpecList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -1105,7 +1105,7 @@ extension AvailabilitySpecListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -1145,8 +1145,8 @@ public struct AvailabilityVersionRestrictionListSyntax: SyntaxCollection, Syntax let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.availabilityVersionRestrictionList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -1314,7 +1314,7 @@ extension AvailabilityVersionRestrictionListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -1354,8 +1354,8 @@ public struct CaseItemListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.caseItemList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -1523,7 +1523,7 @@ extension CaseItemListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -1563,8 +1563,8 @@ public struct CatchClauseListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.catchClauseList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -1732,7 +1732,7 @@ extension CatchClauseListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -1772,8 +1772,8 @@ public struct CatchItemListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.catchItemList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -1941,7 +1941,7 @@ extension CatchItemListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -1981,8 +1981,8 @@ public struct ClosureCaptureItemListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.closureCaptureItemList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -2150,7 +2150,7 @@ extension ClosureCaptureItemListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -2190,8 +2190,8 @@ public struct ClosureParamListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.closureParamList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -2359,7 +2359,7 @@ extension ClosureParamListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -2399,8 +2399,8 @@ public struct ClosureParameterListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.closureParameterList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -2568,7 +2568,7 @@ extension ClosureParameterListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -2608,8 +2608,8 @@ public struct CodeBlockItemListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.codeBlockItemList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -2777,7 +2777,7 @@ extension CodeBlockItemListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -2817,8 +2817,8 @@ public struct CompositionTypeElementListSyntax: SyntaxCollection, SyntaxHashable let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.compositionTypeElementList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -2986,7 +2986,7 @@ extension CompositionTypeElementListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -3026,8 +3026,8 @@ public struct ConditionElementListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.conditionElementList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -3195,7 +3195,7 @@ extension ConditionElementListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -3235,8 +3235,8 @@ public struct DeclNameArgumentListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.declNameArgumentList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -3404,7 +3404,7 @@ extension DeclNameArgumentListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -3444,8 +3444,8 @@ public struct DesignatedTypeListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.designatedTypeList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -3613,7 +3613,7 @@ extension DesignatedTypeListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -3653,8 +3653,8 @@ public struct DictionaryElementListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.dictionaryElementList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -3822,7 +3822,7 @@ extension DictionaryElementListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -3862,8 +3862,8 @@ public struct DifferentiabilityParamListSyntax: SyntaxCollection, SyntaxHashable let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.differentiabilityParamList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -4031,7 +4031,7 @@ extension DifferentiabilityParamListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -4068,8 +4068,8 @@ public struct DocumentationAttributeArgumentsSyntax: SyntaxCollection, SyntaxHas let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.documentationAttributeArguments, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -4237,7 +4237,7 @@ extension DocumentationAttributeArgumentsSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -4274,8 +4274,8 @@ public struct EffectsArgumentsSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.effectsArguments, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -4443,7 +4443,7 @@ extension EffectsArgumentsSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -4480,8 +4480,8 @@ public struct EnumCaseElementListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.enumCaseElementList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -4649,7 +4649,7 @@ extension EnumCaseElementListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -4689,8 +4689,8 @@ public struct EnumCaseParameterListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.enumCaseParameterList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -4858,7 +4858,7 @@ extension EnumCaseParameterListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -4895,8 +4895,8 @@ public struct ExprListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.exprList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -5064,7 +5064,7 @@ extension ExprListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -5104,8 +5104,8 @@ public struct FunctionParameterListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.functionParameterList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -5273,7 +5273,7 @@ extension FunctionParameterListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -5313,8 +5313,8 @@ public struct GenericArgumentListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.genericArgumentList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -5482,7 +5482,7 @@ extension GenericArgumentListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -5522,8 +5522,8 @@ public struct GenericParameterListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.genericParameterList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -5691,7 +5691,7 @@ extension GenericParameterListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -5731,8 +5731,8 @@ public struct GenericRequirementListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.genericRequirementList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -5900,7 +5900,7 @@ extension GenericRequirementListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -5940,8 +5940,8 @@ public struct IfConfigClauseListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.ifConfigClauseList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -6109,7 +6109,7 @@ extension IfConfigClauseListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -6149,8 +6149,8 @@ public struct InheritedTypeListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.inheritedTypeList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -6318,7 +6318,7 @@ extension InheritedTypeListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -6358,8 +6358,8 @@ public struct KeyPathComponentListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.keyPathComponentList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -6527,7 +6527,7 @@ extension KeyPathComponentListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -6567,8 +6567,8 @@ public struct MemberDeclListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.memberDeclList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -6736,7 +6736,7 @@ extension MemberDeclListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -6776,8 +6776,8 @@ public struct ModifierListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.modifierList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -6945,7 +6945,7 @@ extension ModifierListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -6985,8 +6985,8 @@ public struct MultipleTrailingClosureElementListSyntax: SyntaxCollection, Syntax let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.multipleTrailingClosureElementList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -7154,7 +7154,7 @@ extension MultipleTrailingClosureElementListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -7194,8 +7194,8 @@ public struct ObjCSelectorSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.objCSelector, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -7363,7 +7363,7 @@ extension ObjCSelectorSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -7403,8 +7403,8 @@ public struct PatternBindingListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.patternBindingList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -7572,7 +7572,7 @@ extension PatternBindingListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -7667,8 +7667,8 @@ public struct PrecedenceGroupAttributeListSyntax: SyntaxCollection, SyntaxHashab let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.precedenceGroupAttributeList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -7836,7 +7836,7 @@ extension PrecedenceGroupAttributeListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -7876,8 +7876,8 @@ public struct PrecedenceGroupNameListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.precedenceGroupNameList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -8045,7 +8045,7 @@ extension PrecedenceGroupNameListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -8085,8 +8085,8 @@ public struct PrimaryAssociatedTypeListSyntax: SyntaxCollection, SyntaxHashable let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.primaryAssociatedTypeList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -8254,7 +8254,7 @@ extension PrimaryAssociatedTypeListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -8359,8 +8359,8 @@ public struct SpecializeAttributeSpecListSyntax: SyntaxCollection, SyntaxHashabl let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.specializeAttributeSpecList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -8528,7 +8528,7 @@ extension SpecializeAttributeSpecListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -8611,8 +8611,8 @@ public struct StringLiteralSegmentsSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.stringLiteralSegments, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -8780,7 +8780,7 @@ extension StringLiteralSegmentsSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -8863,8 +8863,8 @@ public struct SwitchCaseListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.switchCaseList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -9032,7 +9032,7 @@ extension SwitchCaseListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -9072,8 +9072,8 @@ public struct TupleExprElementListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.tupleExprElementList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -9241,7 +9241,7 @@ extension TupleExprElementListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -9281,8 +9281,8 @@ public struct TuplePatternElementListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.tuplePatternElementList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -9450,7 +9450,7 @@ extension TuplePatternElementListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -9490,8 +9490,8 @@ public struct TupleTypeElementListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.tupleTypeElementList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -9659,7 +9659,7 @@ extension TupleTypeElementListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -9696,8 +9696,8 @@ public struct UnexpectedNodesSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.unexpectedNodes, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -9865,7 +9865,7 @@ extension UnexpectedNodesSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) @@ -9905,8 +9905,8 @@ public struct YieldExprListSyntax: SyntaxCollection, SyntaxHashable { let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in let raw = RawSyntax.makeLayout(kind: SyntaxKind.yieldExprList, from: children.map { - $0.raw - }, arena: arena) + $0.raw + }, arena: arena) return SyntaxData.forRoot(raw) } self.init(data) @@ -10074,7 +10074,7 @@ extension YieldExprListSyntax: BidirectionalCollection { return rawChildren.distance(from: start, to: end) } - public subscript (position: SyntaxChildrenIndex) -> Element { + public subscript(position: SyntaxChildrenIndex) -> Element { let (raw, info) = rawChildren[position] let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info) let data = SyntaxData(absoluteRaw, parent: Syntax(self)) diff --git a/Sources/SwiftSyntax/generated/SyntaxRewriter.swift b/Sources/SwiftSyntax/generated/SyntaxRewriter.swift index 909cee80a34..047d4e84ed7 100644 --- a/Sources/SwiftSyntax/generated/SyntaxRewriter.swift +++ b/Sources/SwiftSyntax/generated/SyntaxRewriter.swift @@ -6904,8 +6904,8 @@ open class SyntaxRewriter { var childIndex = 0 for (raw, info) in RawSyntaxChildren(syntaxNode) { defer { - childIndex += 1 - } + childIndex += 1 + } guard let child = raw else { // Node does not exist. If we are collecting rewritten nodes, we need to // collect this one as well, otherwise we can ignore it. diff --git a/Sources/SwiftSyntax/generated/Tokens.swift b/Sources/SwiftSyntax/generated/Tokens.swift index af957e837ac..df4f5b2e765 100644 --- a/Sources/SwiftSyntax/generated/Tokens.swift +++ b/Sources/SwiftSyntax/generated/Tokens.swift @@ -23,7 +23,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -37,7 +37,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -51,7 +51,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -65,7 +65,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -81,7 +81,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -95,7 +95,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -109,7 +109,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -125,7 +125,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -139,7 +139,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -153,7 +153,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -167,7 +167,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -183,7 +183,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -199,7 +199,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -215,7 +215,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -229,7 +229,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -245,7 +245,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -261,7 +261,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -275,7 +275,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -289,7 +289,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -303,7 +303,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -317,7 +317,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -331,7 +331,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -345,7 +345,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -361,7 +361,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -375,7 +375,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -389,7 +389,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -403,7 +403,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -417,7 +417,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -431,7 +431,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -445,7 +445,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -459,7 +459,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -473,7 +473,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -487,7 +487,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -501,7 +501,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -517,7 +517,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -533,7 +533,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -549,7 +549,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -563,7 +563,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -577,7 +577,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -591,7 +591,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -605,7 +605,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -619,7 +619,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -633,7 +633,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -647,7 +647,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -661,7 +661,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -677,7 +677,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -693,7 +693,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -707,7 +707,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, presence: presence - + ) } @@ -720,7 +720,7 @@ extension TokenSyntax { leadingTrivia: leadingTrivia, trailingTrivia: [], presence: presence - + ) } } diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift index ac0210ca88c..c421bdb1f97 100644 --- a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift +++ b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift @@ -130,8 +130,8 @@ public struct RawAccessPathSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .accessPath, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -450,8 +450,8 @@ public struct RawAccessorListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .accessorList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -724,8 +724,8 @@ public struct RawArrayElementListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .arrayElementList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -1391,8 +1391,8 @@ public struct RawAttributeListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .attributeList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -2195,8 +2195,8 @@ public struct RawAvailabilitySpecListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .availabilitySpecList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -2315,8 +2315,8 @@ public struct RawAvailabilityVersionRestrictionListSyntax: RawSyntaxNodeProtocol let raw = RawSyntax.makeLayout( kind: .availabilityVersionRestrictionList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -2843,8 +2843,8 @@ public struct RawCaseItemListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .caseItemList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -2975,8 +2975,8 @@ public struct RawCatchClauseListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .catchClauseList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -3107,8 +3107,8 @@ public struct RawCatchItemListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .catchItemList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -3439,8 +3439,8 @@ public struct RawClosureCaptureItemListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .closureCaptureItemList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -3865,8 +3865,8 @@ public struct RawClosureParamListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .closureParamList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -4067,8 +4067,8 @@ public struct RawClosureParameterListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .closureParameterList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -4408,8 +4408,8 @@ public struct RawCodeBlockItemListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .codeBlockItemList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -4648,8 +4648,8 @@ public struct RawCompositionTypeElementListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .compositionTypeElementList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -4826,8 +4826,8 @@ public struct RawConditionElementListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .conditionElementList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -5553,8 +5553,8 @@ public struct RawDeclNameArgumentListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .declNameArgumentList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -6228,8 +6228,8 @@ public struct RawDesignatedTypeListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .designatedTypeList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -6278,8 +6278,8 @@ public struct RawDictionaryElementListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .dictionaryElementList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -6641,8 +6641,8 @@ public struct RawDifferentiabilityParamListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .differentiabilityParamList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -7327,8 +7327,8 @@ public struct RawDocumentationAttributeArgumentsSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .documentationAttributeArguments, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -7575,8 +7575,8 @@ public struct RawEffectsArgumentsSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .effectsArguments, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -7719,8 +7719,8 @@ public struct RawEnumCaseElementListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .enumCaseElementList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -7945,8 +7945,8 @@ public struct RawEnumCaseParameterListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .enumCaseParameterList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -8349,8 +8349,8 @@ public struct RawExprListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .exprList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -9542,8 +9542,8 @@ public struct RawFunctionParameterListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .functionParameterList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -10016,8 +10016,8 @@ public struct RawGenericArgumentListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .genericArgumentList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -10230,8 +10230,8 @@ public struct RawGenericParameterListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .genericParameterList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -10398,8 +10398,8 @@ public struct RawGenericRequirementListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .genericRequirementList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -10848,8 +10848,8 @@ public struct RawIfConfigClauseListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .ifConfigClauseList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -11661,8 +11661,8 @@ public struct RawInheritedTypeListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .inheritedTypeList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -12203,8 +12203,8 @@ public struct RawKeyPathComponentListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .keyPathComponentList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -13749,8 +13749,8 @@ public struct RawMemberDeclListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .memberDeclList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -14347,8 +14347,8 @@ public struct RawModifierListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .modifierList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -14467,8 +14467,8 @@ public struct RawMultipleTrailingClosureElementListSyntax: RawSyntaxNodeProtocol let raw = RawSyntax.makeLayout( kind: .multipleTrailingClosureElementList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -14797,8 +14797,8 @@ public struct RawObjCSelectorSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .objCSelector, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -15819,8 +15819,8 @@ public struct RawPatternBindingListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .patternBindingList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -16611,8 +16611,8 @@ public struct RawPrecedenceGroupAttributeListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .precedenceGroupAttributeList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -16861,8 +16861,8 @@ public struct RawPrecedenceGroupNameListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .precedenceGroupNameList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -17145,8 +17145,8 @@ public struct RawPrimaryAssociatedTypeListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .primaryAssociatedTypeList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -18166,8 +18166,8 @@ public struct RawSpecializeAttributeSpecListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .specializeAttributeSpecList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -18462,8 +18462,8 @@ public struct RawStringLiteralSegmentsSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .stringLiteralSegments, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -19244,8 +19244,8 @@ public struct RawSwitchCaseListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .switchCaseList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -19935,8 +19935,8 @@ public struct RawTupleExprElementListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .tupleExprElementList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -20161,8 +20161,8 @@ public struct RawTuplePatternElementListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .tuplePatternElementList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -20387,8 +20387,8 @@ public struct RawTupleTypeElementListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .tupleTypeElementList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -21332,8 +21332,8 @@ public struct RawUnexpectedNodesSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .unexpectedNodes, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 @@ -22212,8 +22212,8 @@ public struct RawYieldExprListSyntax: RawSyntaxNodeProtocol { let raw = RawSyntax.makeLayout( kind: .yieldExprList, uninitializedCount: elements.count, arena: arena) { layout in guard var ptr = layout.baseAddress else { - return - } + return + } for elem in elements { ptr.initialize(to: elem.raw) ptr += 1 diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift index 15a509572e8..073bce7fa02 100644 --- a/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift +++ b/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift @@ -43,19 +43,19 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { case .expectedNonNil(expectedKind: let expectedKind, file: _, line: _): return "Expected non-nil node of type \(expectedKind) but received nil" case .kindMismatch( - expectedKind: let expectedKind, - actualKind: let actualKind, - file: _, - line: _ - ): + expectedKind: let expectedKind, + actualKind: let actualKind, + file: _, + line: _ + ): return "Expected node of type \(expectedKind) but received \(actualKind)" case .tokenMismatch( - expectedTokenChoices: let tokenChoices, - actualKind: let actualKind, - actualText: let actualText, - file: _, - line: _ - ): + expectedTokenChoices: let tokenChoices, + actualKind: let actualKind, + actualText: let actualText, + file: _, + line: _ + ): return "Expected token with one of \(tokenChoices) but received \(actualKind) with text '\(actualText)'" } } @@ -66,19 +66,19 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { case .expectedNonNil(expectedKind: _, file: let file, line: let line): return (file, line) case .kindMismatch( - expectedKind: _, - actualKind: _, - file: let file, - line: let line - ): + expectedKind: _, + actualKind: _, + file: let file, + line: let line + ): return (file, line) case .tokenMismatch( - expectedTokenChoices: _, - actualKind: _, - actualText: _, - file: let file, - line: let line - ): + expectedTokenChoices: _, + actualKind: _, + actualText: _, + file: let file, + line: let line + ): return (file, line) } } @@ -94,11 +94,11 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { } guard Node.isKindOf(raw) else { return .kindMismatch( - expectedKind: Node.self, - actualKind: raw.kind, - file: file, - line: line - ) + expectedKind: Node.self, + actualKind: raw.kind, + file: file, + line: line + ) } return nil } @@ -110,11 +110,11 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { ) -> ValidationError? { if raw != nil { return verify( - raw, - as: Node.self, - file: file, - line: line - ) + raw, + as: Node.self, + file: file, + line: line + ) } return nil } @@ -131,12 +131,12 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { // regarding it are fixed. if raw != nil { return verify( - raw, - as: RawTokenSyntax.self, - tokenChoices: tokenChoices, - file: file, - line: line - ) + raw, + as: RawTokenSyntax.self, + tokenChoices: tokenChoices, + file: file, + line: line + ) } return nil } diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxExprNodes.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxExprNodes.swift index 98dd79a1c38..ca2a9332fd5 100644 --- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxExprNodes.swift +++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxExprNodes.swift @@ -2844,7 +2844,7 @@ public struct KeyPathExprSyntax: ExprSyntaxProtocol, SyntaxHashable { unexpectedBeforeBackslash, backslash: backslash, unexpectedBetweenBackslashAndRoot, - root: Optional.none, + root: Optional .none, unexpectedBetweenRootAndComponents, components: components, unexpectedAfterComponents, @@ -3357,7 +3357,7 @@ public struct MemberAccessExprSyntax: ExprSyntaxProtocol, SyntaxHashable { self.init( leadingTrivia: leadingTrivia, unexpectedBeforeBase, - base: Optional.none, + base: Optional .none, unexpectedBetweenBaseAndDot, dot: dot, unexpectedBetweenDotAndName, @@ -4169,7 +4169,7 @@ public struct PostfixIfConfigExprSyntax: ExprSyntaxProtocol, SyntaxHashable { self.init( leadingTrivia: leadingTrivia, unexpectedBeforeBase, - base: Optional.none, + base: Optional .none, unexpectedBetweenBaseAndConfig, config: config, unexpectedAfterConfig, diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodes.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodes.swift index 686a7d1e6ff..7f553d5830a 100644 --- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodes.swift +++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodes.swift @@ -2649,7 +2649,7 @@ public struct CatchItemSyntax: SyntaxProtocol, SyntaxHashable { self.init( leadingTrivia: leadingTrivia, unexpectedBeforePattern, - pattern: Optional.none, + pattern: Optional .none, unexpectedBetweenPatternAndWhereClause, whereClause: whereClause, unexpectedBetweenWhereClauseAndTrailingComma, @@ -3679,7 +3679,7 @@ public struct ClosureParameterSyntax: SyntaxProtocol, SyntaxHashable { unexpectedBetweenSecondNameAndColon, colon: colon, unexpectedBetweenColonAndType, - type: Optional.none, + type: Optional .none, unexpectedBetweenTypeAndEllipsis, ellipsis: ellipsis, unexpectedBetweenEllipsisAndTrailingComma, @@ -9644,7 +9644,7 @@ public struct GenericParameterSyntax: SyntaxProtocol, SyntaxHashable { unexpectedBetweenNameAndColon, colon: colon, unexpectedBetweenColonAndInheritedType, - inheritedType: Optional.none, + inheritedType: Optional .none, unexpectedBetweenInheritedTypeAndTrailingComma, trailingComma: trailingComma, unexpectedAfterTrailingComma, @@ -10285,7 +10285,7 @@ public struct IfConfigClauseSyntax: SyntaxProtocol, SyntaxHashable { unexpectedBeforePoundKeyword, poundKeyword: poundKeyword, unexpectedBetweenPoundKeywordAndCondition, - condition: Optional.none, + condition: Optional .none, unexpectedBetweenConditionAndElements, elements: elements, unexpectedAfterElements, @@ -14823,7 +14823,7 @@ public struct QualifiedDeclNameSyntax: SyntaxProtocol, SyntaxHashable { self.init( leadingTrivia: leadingTrivia, unexpectedBeforeBaseType, - baseType: Optional.none, + baseType: Optional .none, unexpectedBetweenBaseTypeAndDot, dot: dot, unexpectedBetweenDotAndName, diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxStmtNodes.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxStmtNodes.swift index 1370f48b786..67c4eb9183d 100644 --- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxStmtNodes.swift +++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxStmtNodes.swift @@ -1778,7 +1778,7 @@ public struct ReturnStmtSyntax: StmtSyntaxProtocol, SyntaxHashable { unexpectedBeforeReturnKeyword, returnKeyword: returnKeyword, unexpectedBetweenReturnKeywordAndExpression, - expression: Optional.none, + expression: Optional .none, unexpectedAfterExpression, trailingTrivia: trailingTrivia ) From 8f6eb73466843fad3fdf5d06b072a5600ae4d74a Mon Sep 17 00:00:00 2001 From: Kim de Vos Date: Fri, 28 Apr 2023 15:05:37 +0200 Subject: [PATCH 3/3] Update readme describing how `generate-swiftsyntax` with HEAD works --- CodeGeneration/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CodeGeneration/README.md b/CodeGeneration/README.md index b0b00ba3235..42749364896 100644 --- a/CodeGeneration/README.md +++ b/CodeGeneration/README.md @@ -4,7 +4,8 @@ This directory contains file to generate source code that is part of the SwiftSy Some source code inside SwiftSyntax is generated using [SwiftSyntaxBuilder](../Sources/SwiftSyntaxBuilder), a Swift library whose purpose is to generate Swift code using Swift itself. This kind of code generation is performed by the Swift package defined in this directory. -This directory is a standalone package that uses a pinned version of SwiftSyntaxBuilder. It is thus NOT using SwiftSyntaxBuilder of the parent directory. This guarantees that when `generate-swiftsyntax` is run, it can't break its own build. +This directory is a standalone package that uses HEAD of the current branch. This guarantees that when `generate-swiftsyntax` is run, it can't break its own build when run multiple times without committing. +This means that `CodeGeneration` will build against your latest local commit of SwiftSyntax. If you are making changes to `SwiftSyntax` that affect how code is being generated, commit your SwiftSyntax changes (pushing is not necessary) and re-generate files afterwards. To re-generate the files after changing `CodeGeneration` run the `generate-swiftsyntax` target of `CodeGeneration` and pass `path/to/swift-syntax/Sources` as the argument.