WIP: generate TokenSpec(.keyword) for KeywordToken in CodeGeneration

Author: StevenWong12

CodeGeneration/Sources/SyntaxSupport/Child.swift

@@ -12,7 +12,7 @@
 
 /// The kind of token a node can contain. Either a token of a specific kind or a
 /// keyword with the given text.
-public enum TokenChoice: CustomStringConvertible {
+public enum TokenChoice {
   case keyword(text: String)
   case token(tokenKind: String)
 
@@ -23,19 +23,24 @@ public enum TokenChoice: CustomStringConvertible {
     }
   }
 
-  public var description: String {
+  public var descriptionAsTokenSpec: String {
     switch self {
-    case .keyword(text: let string):
-      guard let keyword = KEYWORDS.first(where: { $0.name == string }) else {
-        assertionFailure("no such keyword named \(string)")
+    case .keyword(text: let text):
+      guard let keyword = KEYWORDS.first(where: { $0.name == text }) else {
+        assertionFailure("no such keyword named \(text)")
         return ""
       }
       return ".keyword(.\(keyword.escapedName))"
-    case .token(tokenKind: let string):
-      guard let token = SYNTAX_TOKENS.first(where: { $0.name == string.components(separatedBy: "Token").first }) else {
-        assertionFailure("no such token named \(string)")
+    case .token(tokenKind: let tokenKind):
+      guard let token = SYNTAX_TOKENS.first(where: { $0.name == tokenKind.components(separatedBy: "Token").first }) else {
+        assertionFailure("no such token named \(tokenKind)")
         return ""
       }
+
+      if tokenKind == "KeywordToken" {
+        return "TokenSpec(.keyword)"
+      }
+
       return ".\(token.swiftKind)"
     }
   }

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/IncrementalParseUtilsFile.swift

@@ -33,7 +33,7 @@ let IncrementalParseUtilsFile = SourceFileSyntax(leadingTrivia: copyrightHeader)
 
         for node in NON_BASE_SYNTAX_NODES {
           SwitchCaseSyntax("case .\(node.varOrCaseName):") {
-            StmtSyntax("return [\(raw: Set(node.firstPotentialToken.map{$0.description}).joined(separator: ", "))]")
+            StmtSyntax("return [\(raw: Set(node.firstPotentialToken.map{$0.descriptionAsTokenSpec}).joined(separator: ", "))]")
           }
         }
         SwitchCaseSyntax("default:") {