Merge pull request #1376 from kimdv/kimdv/clean-raw-syntax-validation

kimdv · web-flow · commit d81f0bfa1e14 · 2023-03-03T18:08:46.000+01:00
diff --git a/CodeGeneration/Package.swift b/CodeGeneration/Package.swift
@@ -11,7 +11,7 @@ let package = Package(
     .executable(name: "generate-swiftsyntax", targets: ["generate-swiftsyntax"])
   ],
   dependencies: [
-    .package(url: "https://github.com/apple/swift-syntax.git", revision: "4727d3c3f81be056cf7f9636d682ac9879270d12"),
+    .package(url: "https://github.com/apple/swift-syntax.git", revision: "94b9021a2e461fc9a4b3bda6f4734119b52e8094"),
     .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.2.2")),
   ],
   targets: [
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxValidationFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxValidationFile.swift
@@ -15,7 +15,7 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: "\(generateCopyrightHeader(for: "generate-swiftsyntax"))" + .newline) {
+let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {
   try FunctionDeclSyntax(
     """
     /// Check that the `layout` is valid for the given 'SyntaxKind'.
@@ -26,12 +26,12 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: "\(generateCo
     """
   ) {
     IfConfigDeclSyntax(
-      clauses: IfConfigClauseListSyntax {
+      clauses: try IfConfigClauseListSyntax {
         IfConfigClauseSyntax(
           poundKeyword: .poundIfKeyword(),
           condition: ExprSyntax("DEBUG"),
           elements: .statements(
-            CodeBlockItemListSyntax {
+            try CodeBlockItemListSyntax {
               DeclSyntax(
                 #"""
                 enum ValidationError: CustomStringConvertible {
@@ -93,7 +93,6 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: "\(generateCo
                        Error validating child at index \(index) of \(nodeKind):
                        \(error.description)
                        """, file: file, line: line)
-                       _ = 1
                   }
                 }
                 """#
@@ -117,7 +116,7 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: "\(generateCo
                 """#
               )
 
-              try! SwitchExprSyntax("switch kind") {
+              try SwitchExprSyntax("switch kind") {
                 SwitchCaseSyntax(
                   """
                   case .token:
@@ -126,7 +125,7 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: "\(generateCo
                 )
 
                 for node in NON_BASE_SYNTAX_NODES {
-                  SwitchCaseSyntax("case .\(raw: node.swiftSyntaxKind):") {
+                  try SwitchCaseSyntax("case .\(raw: node.swiftSyntaxKind):") {
                     if node.isBuildable || node.isMissing {
                       ExprSyntax("assert(layout.count == \(raw: node.children.count))")
                       for (index, child) in node.children.enumerated() {
@@ -145,7 +144,7 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: "\(generateCo
                         }
                       }
                     } else if node.isSyntaxCollection {
-                      try! ForInStmtSyntax("for (index, element) in layout.enumerated()") {
+                      try ForInStmtSyntax("for (index, element) in layout.enumerated()") {
                         if let collectionElementChoices = node.collectionElementChoices, !collectionElementChoices.isEmpty {
                           let verifiedChoices = ArrayExprSyntax {
                             for choiceName in node.collectionElementChoices! {
@@ -162,8 +161,6 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: "\(generateCo
                         }
                       }
                     }
-
-                    BreakStmtSyntax()
                   }
                 }
               }
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxBaseNodesFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxBaseNodesFile.swift
@@ -142,7 +142,7 @@ let syntaxBaseNodesFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeade
             IfConfigClauseSyntax(
               poundKeyword: .poundIfKeyword(),
               condition: ExprSyntax("DEBUG"),
-              elements: IfConfigClauseSyntax.Elements.statements(
+              elements: .statements(
                 CodeBlockItemListSyntax {
                   try! SwitchExprSyntax("switch data.raw.kind") {
                     SwitchCaseSyntax(
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxRewriterFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxRewriterFile.swift
@@ -162,7 +162,7 @@ let syntaxRewriterFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader
       """
     )
 
-    IfConfigDeclSyntax(
+    try IfConfigDeclSyntax(
       leadingTrivia:
         """
         // SwiftSyntax requires a lot of stack space in debug builds for syntax tree
@@ -177,8 +177,8 @@ let syntaxRewriterFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader
           poundKeyword: .poundIfKeyword(),
           condition: ExprSyntax("DEBUG"),
           elements: .statements(
-            CodeBlockItemListSyntax {
-              try! FunctionDeclSyntax(
+            try CodeBlockItemListSyntax {
+              try FunctionDeclSyntax(
                 """
                 /// Implementation detail of visit(_:). Do not call directly.
                 ///
@@ -225,7 +225,7 @@ let syntaxRewriterFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader
           )
         )
         IfConfigClauseSyntax(
-          poundKeyword: .poundElseKeyword(leadingTrivia: .newline),
+          poundKeyword: .poundElseKeyword(),
           elements: .statements(
             CodeBlockItemListSyntax {
               try! FunctionDeclSyntax("private func visit(_ data: SyntaxData) -> Syntax") {
@@ -244,8 +244,7 @@ let syntaxRewriterFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader
             }
           )
         )
-      },
-      poundEndif: .poundEndifKeyword(leadingTrivia: .newline)
+      }
     )
 
     DeclSyntax(
diff --git a/Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift b/Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift
@@ -88,7 +88,8 @@ public struct DeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
       break
     default:
       fatalError("Unable to create DeclSyntax from \(data.raw.kind)")
-    }#endif 
+    }
+    #endif 
     self._syntaxNode = Syntax(data)
   }
   
@@ -236,7 +237,8 @@ public struct ExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
       break
     default:
       fatalError("Unable to create ExprSyntax from \(data.raw.kind)")
-    }#endif 
+    }
+    #endif 
     self._syntaxNode = Syntax(data)
   }
   
@@ -408,7 +410,8 @@ public struct PatternSyntax: PatternSyntaxProtocol, SyntaxHashable {
       break
     default:
       fatalError("Unable to create PatternSyntax from \(data.raw.kind)")
-    }#endif 
+    }
+    #endif 
     self._syntaxNode = Syntax(data)
   }
   
@@ -539,7 +542,8 @@ public struct StmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
       break
     default:
       fatalError("Unable to create StmtSyntax from \(data.raw.kind)")
-    }#endif 
+    }
+    #endif 
     self._syntaxNode = Syntax(data)
   }
   
@@ -679,7 +683,8 @@ public struct TypeSyntax: TypeSyntaxProtocol, SyntaxHashable {
       break
     default:
       fatalError("Unable to create TypeSyntax from \(data.raw.kind)")
-    }#endif 
+    }
+    #endif 
     self._syntaxNode = Syntax(data)
   }
   
diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import SwiftSyntaxBuilder`
`15`	`15`	`import SyntaxSupport`
`16`	`16`	`import Utils`
`17`	`17`
`18`		`-let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: "\(generateCopyrightHeader(for: "generate-swiftsyntax"))" + .newline) {`
	`18`	`+let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {`
`19`	`19`	`try FunctionDeclSyntax(`
`20`	`20`	`"""`
`21`	`21`	/// Check that the `layout` is valid for the given 'SyntaxKind'.
`@@ -26,12 +26,12 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: "\(generateCo`
`26`	`26`	`"""`
`27`	`27`	`) {`
`28`	`28`	`IfConfigDeclSyntax(`
`29`		`- clauses: IfConfigClauseListSyntax {`
	`29`	`+ clauses: try IfConfigClauseListSyntax {`
`30`	`30`	`IfConfigClauseSyntax(`
`31`	`31`	`poundKeyword: .poundIfKeyword(),`
`32`	`32`	`condition: ExprSyntax("DEBUG"),`
`33`	`33`	`elements: .statements(`
`34`		`- CodeBlockItemListSyntax {`
	`34`	`+ try CodeBlockItemListSyntax {`
`35`	`35`	`DeclSyntax(`
`36`	`36`	`#"""`
`37`	`37`	`enum ValidationError: CustomStringConvertible {`
`@@ -93,7 +93,6 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: "\(generateCo`
`93`	`93`	`Error validating child at index \(index) of \(nodeKind):`
`94`	`94`	`\(error.description)`
`95`	`95`	`""", file: file, line: line)`
`96`		`- _ = 1`
`97`	`96`	`}`
`98`	`97`	`}`
`99`	`98`	`"""#`
`@@ -117,7 +116,7 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: "\(generateCo`
`117`	`116`	`"""#`
`118`	`117`	`)`
`119`	`118`
`120`		`- try! SwitchExprSyntax("switch kind") {`
	`119`	`+ try SwitchExprSyntax("switch kind") {`
`121`	`120`	`SwitchCaseSyntax(`
`122`	`121`	`"""`
`123`	`122`	`case .token:`
`@@ -126,7 +125,7 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: "\(generateCo`
`126`	`125`	`)`
`127`	`126`
`128`	`127`	`for node in NON_BASE_SYNTAX_NODES {`
`129`		`- SwitchCaseSyntax("case .\(raw: node.swiftSyntaxKind):") {`
	`128`	`+ try SwitchCaseSyntax("case .\(raw: node.swiftSyntaxKind):") {`
`130`	`129`	`if node.isBuildable \|\| node.isMissing {`
`131`	`130`	`ExprSyntax("assert(layout.count == \(raw: node.children.count))")`
`132`	`131`	`for (index, child) in node.children.enumerated() {`
`@@ -145,7 +144,7 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: "\(generateCo`
`145`	`144`	`}`
`146`	`145`	`}`
`147`	`146`	`} else if node.isSyntaxCollection {`
`148`		`- try! ForInStmtSyntax("for (index, element) in layout.enumerated()") {`
	`147`	`+ try ForInStmtSyntax("for (index, element) in layout.enumerated()") {`
`149`	`148`	`if let collectionElementChoices = node.collectionElementChoices, !collectionElementChoices.isEmpty {`
`150`	`149`	`let verifiedChoices = ArrayExprSyntax {`
`151`	`150`	`for choiceName in node.collectionElementChoices! {`
`@@ -162,8 +161,6 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: "\(generateCo`
`162`	`161`	`}`
`163`	`162`	`}`
`164`	`163`	`}`
`165`		`-`
`166`		`- BreakStmtSyntax()`
`167`	`164`	`}`
`168`	`165`	`}`
`169`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ let syntaxRewriterFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader`
`162`	`162`	`"""`
`163`	`163`	`)`
`164`	`164`
`165`		`- IfConfigDeclSyntax(`
	`165`	`+ try IfConfigDeclSyntax(`
`166`	`166`	`leadingTrivia:`
`167`	`167`	`"""`
`168`	`168`	`// SwiftSyntax requires a lot of stack space in debug builds for syntax tree`
`@@ -177,8 +177,8 @@ let syntaxRewriterFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader`
`177`	`177`	`poundKeyword: .poundIfKeyword(),`
`178`	`178`	`condition: ExprSyntax("DEBUG"),`
`179`	`179`	`elements: .statements(`
`180`		`- CodeBlockItemListSyntax {`
`181`		`- try! FunctionDeclSyntax(`
	`180`	`+ try CodeBlockItemListSyntax {`
	`181`	`+ try FunctionDeclSyntax(`
`182`	`182`	`"""`
`183`	`183`	`/// Implementation detail of visit(_:). Do not call directly.`
`184`	`184`	`///`
`@@ -225,7 +225,7 @@ let syntaxRewriterFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader`
`225`	`225`	`)`
`226`	`226`	`)`
`227`	`227`	`IfConfigClauseSyntax(`
`228`		`- poundKeyword: .poundElseKeyword(leadingTrivia: .newline),`
	`228`	`+ poundKeyword: .poundElseKeyword(),`
`229`	`229`	`elements: .statements(`
`230`	`230`	`CodeBlockItemListSyntax {`
`231`	`231`	`try! FunctionDeclSyntax("private func visit(_ data: SyntaxData) -> Syntax") {`
`@@ -244,8 +244,7 @@ let syntaxRewriterFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader`
`244`	`244`	`}`
`245`	`245`	`)`
`246`	`246`	`)`
`247`		`- },`
`248`		`- poundEndif: .poundEndifKeyword(leadingTrivia: .newline)`
	`247`	`+ }`
`249`	`248`	`)`
`250`	`249`
`251`	`250`	`DeclSyntax(`