Move code from Misc.swift to other files

Nobody loves files whose best description is “miscellaneous”.

Author: ahoppen

CodeGeneration/Sources/generate-swiftsyntax/GenerateSwiftSyntax.swift

@@ -99,7 +99,6 @@ struct GenerateSwiftSyntax: ParsableCommand {
 
         // SwiftSyntax
         GeneratedFileSpec(swiftSyntaxGeneratedDir + ["Keyword.swift"], keywordFile),
-        GeneratedFileSpec(swiftSyntaxGeneratedDir + ["Misc.swift"], miscFile),
         GeneratedFileSpec(swiftSyntaxGeneratedDir + ["raw", "RawSyntaxNodes.swift"], rawSyntaxNodesFile),
         GeneratedFileSpec(swiftSyntaxGeneratedDir + ["raw", "RawSyntaxValidation.swift"], rawSyntaxValidationFile),
         GeneratedFileSpec(swiftSyntaxGeneratedDir + ["SyntaxAnyVisitor.swift"], syntaxAnyVisitorFile),

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/MiscFile.swift

@@ -246,4 +246,25 @@ let syntaxBaseNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
       """
     )
   }
+
+  try! ExtensionDeclSyntax("extension Syntax") {
+    try VariableDeclSyntax("public static var structure: SyntaxNodeStructure") {
+      let choices = ArrayExprSyntax {
+        ArrayElementSyntax(
+          leadingTrivia: .newline,
+          expression: ExprSyntax(".node(TokenSyntax.self)")
+        )
+
+        for node in NON_BASE_SYNTAX_NODES {
+          ArrayElementSyntax(
+            leadingTrivia: .newline,
+            expression: ExprSyntax(".node(\(raw: node.name).self)")
+          )
+        }
+      }
+
+      StmtSyntax("return .choices(\(choices))")
+    }
+  }
+
 }

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxBaseNodesFile.swift

@@ -55,5 +55,19 @@ let syntaxKindFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
         }
       }
     }
+
+    try VariableDeclSyntax("public var syntaxNodeType: SyntaxProtocol.Type") {
+      try SwitchExprSyntax("switch self") {
+        SwitchCaseSyntax("case .token:") {
+          StmtSyntax("return TokenSyntax.self")
+        }
+
+        for node in NON_BASE_SYNTAX_NODES {
+          SwitchCaseSyntax("case .\(raw: node.swiftSyntaxKind):") {
+            StmtSyntax("return \(raw: node.name).self")
+          }
+        }
+      }
+    }
   }
 }

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxKindFile.swift

@@ -35,7 +35,6 @@ add_swift_host_library(SwiftSyntax
   generated/raw/RawSyntaxValidation.swift
 
   generated/Keyword.swift
-  generated/Misc.swift
   generated/SyntaxAnyVisitor.swift
   generated/SyntaxBaseNodes.swift
   generated/SyntaxCollections.swift