[swiftSyntax] Add type annotations to speed up compile time

Author: ahoppen

tools/SwiftSyntax/SyntaxBuilders.swift.gyb

@@ -46,8 +46,9 @@ public struct ${Builder} {
     if let list = layout[idx] {
       layout[idx] = list.appending(elt.raw)
     } else {
-      layout[idx] = RawSyntax(kind: .${child.swift_syntax_kind},
-                              layout: [elt.raw], presence: .present)
+      layout[idx] = RawSyntax(kind: SyntaxKind.${child.swift_syntax_kind},
+                              layout: [elt.raw],
+                              presence: SourcePresence.present)
     }
   }
 %       else:

tools/SwiftSyntax/SyntaxFactory.swift.gyb

@@ -58,24 +58,26 @@ public enum SyntaxFactory {
 %         child_params.append("%s: %s" % (child.swift_name, param_type))
 %     child_params = ', '.join(child_params)
   public static func make${node.syntax_kind}(${child_params}) -> ${node.name} {
-    let data = SyntaxData(raw: RawSyntax(kind: .${node.swift_syntax_kind},
-                          layout: [
+    let layout: [RawSyntax?] = [
 %     for child in node.children:
 %       if child.is_optional:
       ${child.swift_name}?.data.raw ?? ${make_missing_swift_child(child)},
 %       else:
       ${child.swift_name}.data.raw,
 %       end
 %     end
-    ], presence: .present))
+    ]
+    let raw = RawSyntax(kind: SyntaxKind.${node.swift_syntax_kind},
+                        layout: layout, presence: SourcePresence.present)
+    let data = SyntaxData(raw: raw)
     return ${node.name}(root: data, data: data)
   }
 %   elif node.is_syntax_collection():
   public static func make${node.syntax_kind}(
     _ elements: [${node.collection_element_type}]) -> ${node.name} {
-    let raw = RawSyntax(kind: .${node.swift_syntax_kind},
+    let raw = RawSyntax(kind: SyntaxKind.${node.swift_syntax_kind},
                         layout: elements.map { $0.data.raw },
-                        presence: .present)
+                        presence: SourcePresence.present)
     let data = SyntaxData(raw: raw)
     return ${node.name}(root: data, data: data)
   }

utils/gyb_syntax_support/__init__.py

@@ -77,11 +77,11 @@ def make_missing_swift_child(child):
         tok_kind = token.swift_kind() if token else "unknown"
         if not token or not token.text:
             tok_kind += '("")'
-        return 'RawSyntax.missingToken(.%s)' % tok_kind
+        return 'RawSyntax.missingToken(TokenKind.%s)' % tok_kind
     else:
         missing_kind = "unknown" if child.syntax_kind == "Syntax" \
                        else child.swift_syntax_kind
-        return 'RawSyntax.missing(.%s)' % missing_kind
+        return 'RawSyntax.missing(SyntaxKind.%s)' % missing_kind
 
 
 def create_node_map():