Skip to content

Commit 0928df8

Browse files
kimdvkimdv
committed
Update swift syntax
1 parent 94120e0 commit 0928df8

File tree

6 files changed

+25
-37
lines changed

6 files changed

+25
-37
lines changed

‎CodeGeneration/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ let package = Package(
1111
.executable(name: "generate-swiftsyntax", targets: ["generate-swiftsyntax"])
1212
],
1313
dependencies: [
14-
.package(url: "https://github.com/apple/swift-syntax.git", revision: "39b3336c3f3bfcd4ddbcbf6a111d8814ffe542f3"),
14+
.package(url: "https://github.com/apple/swift-syntax.git", revision: "94120e0cf9bf541e54fbc8512934daea23a9ad0c"),
1515
.package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.2.2")),
1616
],
1717
targets: [

‎CodeGeneration/Sources/Utils/CodeGenerationFormat.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class CodeGenerationFormat: BasicFormat {
6666

6767
public override func visit(_ node: MemberDeclListItemSyntax) -> MemberDeclListItemSyntax {
6868
let formatted = super.visit(node)
69-
if node.indexInParent != 0 && !node.decl.is(EnumCaseDeclSyntax.self) {
69+
if node != node.parent?.children(viewMode: .sourceAccurate).first?.as(MemberDeclListItemSyntax.self) && !node.decl.is(EnumCaseDeclSyntax.self) {
7070
return ensuringTwoLeadingNewlines(node: formatted)
7171
} else {
7272
return formatted
@@ -92,10 +92,10 @@ public class CodeGenerationFormat: BasicFormat {
9292
}
9393

9494
private func ensuringTwoLeadingNewlines<NodeType: SyntaxProtocol>(node: NodeType) -> NodeType {
95-
if node.leadingTrivia?.first?.isNewline ?? false {
96-
return node.with(\.leadingTrivia, indentedNewline + (node.leadingTrivia ?? []))
95+
if node.leadingTrivia.first?.isNewline ?? false {
96+
return node.with(\.leadingTrivia, indentedNewline + node.leadingTrivia)
9797
} else {
98-
return node.with(\.leadingTrivia, indentedNewline + indentedNewline + (node.leadingTrivia ?? []))
98+
return node.with(\.leadingTrivia, indentedNewline + indentedNewline + node.leadingTrivia)
9999
}
100100
}
101101

@@ -105,10 +105,10 @@ public class CodeGenerationFormat: BasicFormat {
105105
self.visit($0).as(SyntaxType.self)!
106106
}
107107
formattedChildren = formattedChildren.map {
108-
if $0.leadingTrivia?.first?.isNewline == true {
108+
if $0.leadingTrivia.first?.isNewline == true {
109109
return $0
110110
} else {
111-
return $0.with(\.leadingTrivia, indentedNewline + ($0.leadingTrivia ?? []))
111+
return $0.with(\.leadingTrivia, indentedNewline + $0.leadingTrivia)
112112
}
113113
}
114114
indentationLevel -= 1

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,15 +193,15 @@ let rawSyntaxNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
193193
let params = FunctionParameterListSyntax {
194194
for child in node.children {
195195
FunctionParameterSyntax(
196-
firstName: child.isUnexpectedNodes ? .wildcardToken(trailingTrivia: .space) : nil,
197-
secondName: .identifier(child.swiftName),
196+
firstName: child.isUnexpectedNodes ? .wildcardToken(trailingTrivia: .space) : .identifier(child.swiftName),
197+
secondName: child.isUnexpectedNodes ? .identifier(child.swiftName) : nil,
198198
colon: .colonToken(),
199199
type: child.rawParameterType,
200200
defaultArgument: child.isUnexpectedNodes ? child.defaultInitialization : nil
201201
)
202202
}
203203

204-
FunctionParameterSyntax("arena: __shared SyntaxArena", for: .functionParameters)
204+
FunctionParameterSyntax("arena: __shared SyntaxArena")
205205
}
206206
try InitializerDeclSyntax("public init(\(params))") {
207207
if !node.children.isEmpty {

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,20 @@ func syntaxNode(emitKind: String) -> SourceFileSyntax {
6666
)
6767

6868
try! InitializerDeclSyntax("\(node.generateInitializerDeclHeader(optionalBaseAsMissing: false))") {
69-
let parameters = FunctionParameterListSyntax {
69+
let parameters = ClosureParameterListSyntax {
7070
for child in node.children {
71-
FunctionParameterSyntax(firstName: "\(raw: child.swiftName)")
71+
ClosureParameterSyntax(firstName: .identifier(child.swiftName))
7272
}
7373
}
7474

7575
let closureSignature = ClosureSignatureSyntax(
7676
input: .input(
77-
ParameterClauseSyntax {
78-
FunctionParameterSyntax(firstName: .identifier("arena"))
79-
FunctionParameterSyntax(firstName: .wildcardToken())
80-
}
77+
ClosureParameterClauseSyntax(
78+
parameterList: ClosureParameterListSyntax {
79+
ClosureParameterSyntax(firstName: .identifier("arena"))
80+
ClosureParameterSyntax(firstName: .wildcardToken())
81+
}
82+
)
8183
)
8284
)
8385
let layoutList = ArrayExprSyntax {
@@ -384,13 +386,13 @@ fileprivate extension Node {
384386
}
385387

386388
let params = FunctionParameterListSyntax {
387-
FunctionParameterSyntax("leadingTrivia: Trivia? = nil", for: .functionParameters)
389+
FunctionParameterSyntax("leadingTrivia: Trivia? = nil")
388390

389391
for child in children {
390392
createFunctionParameterSyntax(for: child)
391393
}
392394

393-
FunctionParameterSyntax("trailingTrivia: Trivia? = nil", for: .functionParameters)
395+
FunctionParameterSyntax("trailingTrivia: Trivia? = nil")
394396
.with(\.leadingTrivia, .newline)
395397
}
396398

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,7 @@ private func createConvenienceInitializer(node: Node) throws -> InitializerDeclS
7171
produceExpr = ExprSyntax("\(raw: child.swiftName)Builder()")
7272
}
7373
builderParameters.append(
74-
FunctionParameterSyntax(
75-
"@\(raw: builderInitializableType.resultBuilderBaseName) \(raw: child.swiftName)Builder: () throws-> \(raw: builderInitializableType.syntax)",
76-
for: .functionParameters
77-
)
74+
FunctionParameterSyntax("@\(raw: builderInitializableType.resultBuilderBaseName) \(raw: child.swiftName)Builder: () throws-> \(raw: builderInitializableType.syntax)")
7875
)
7976
} else {
8077
produceExpr = convertFromSyntaxProtocolToSyntaxType(child: child)
@@ -95,11 +92,11 @@ private func createConvenienceInitializer(node: Node) throws -> InitializerDeclS
9592
}
9693

9794
let params = ParameterClauseSyntax {
98-
FunctionParameterSyntax("leadingTrivia: Trivia? = nil", for: .functionParameters)
95+
FunctionParameterSyntax("leadingTrivia: Trivia? = nil")
9996
for param in normalParameters + builderParameters {
10097
param
10198
}
102-
FunctionParameterSyntax("trailingTrivia: Trivia? = nil", for: .functionParameters)
99+
FunctionParameterSyntax("trailingTrivia: Trivia? = nil")
103100
}
104101

105102
return try InitializerDeclSyntax(

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

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,8 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
3434
}
3535
enum ValidationError: CustomStringConvertible {
3636
case expectedNonNil(expectedKind: RawSyntaxNodeProtocol.Type, file: StaticString, line: UInt)
37-
case kindMismatch(
38-
expectedKind: RawSyntaxNodeProtocol.Type,
39-
actualKind: SyntaxKind,
40-
file: StaticString,
41-
line: UInt
42-
)
43-
case tokenMismatch(
44-
expectedTokenChoices: [TokenChoice],
45-
actualKind: RawTokenKind,
46-
actualText: SyntaxText,
47-
file: StaticString,
48-
line: UInt
49-
)
37+
case kindMismatch(expectedKind: RawSyntaxNodeProtocol.Type, actualKind: SyntaxKind, file: StaticString, line: UInt)
38+
case tokenMismatch(expectedTokenChoices: [TokenChoice], actualKind: RawTokenKind, actualText: SyntaxText, file: StaticString, line: UInt)
5039

5140

5241
var description: String {

0 commit comments

Comments
 (0)