Move nameForDiagnostics from SyntaxEnum to SyntaxKind

Author: ahoppen

Sources/SwiftParserDiagnostics/SyntaxExtensions.swift

@@ -67,7 +67,7 @@ extension SyntaxProtocol {
     if !allowBlockNames && (syntax.is(CodeBlockSyntax.self) || syntax.is(MemberDeclBlockSyntax.self)) {
       return nil
     }
-    return syntax.as(SyntaxEnum.self).nameForDiagnostics
+    return syntax.kind.nameForDiagnostics
   }
 
   /// A short description of this node that can be displayed inline in a single line.

Sources/SwiftSyntax/Misc.swift.gyb

@@ -42,6 +42,23 @@ extension SyntaxKind {
     case .unknown: return UnknownSyntax.self
 % for node in NON_BASE_SYNTAX_NODES:
     case .${node.swift_syntax_kind}: return ${node.name}.self
+% end
+    }
+  }
+
+  public var nameForDiagnostics: String? {
+    switch self {
+    case .unknown:
+      return nil
+    case .token:
+      return "token"
+% for node in NON_BASE_SYNTAX_NODES:
+    case .${node.swift_syntax_kind}:
+%   if node.name_for_diagnostics:
+      return "${node.name_for_diagnostics}"
+%   else:
+      return nil
+%   end
 % end
     }
   }

Sources/SwiftSyntax/Syntax.swift

@@ -225,6 +225,10 @@ extension SyntaxProtocol {
     return _syntaxNode.data.raw
   }
 
+  public var kind: SyntaxKind {
+    return raw.kind
+  }
+
   public var syntaxNodeType: SyntaxProtocol.Type {
     return self.raw.kind.syntaxNodeType
   }

Sources/SwiftSyntax/SyntaxEnum.swift.gyb

@@ -30,23 +30,6 @@ public enum SyntaxEnum {
   case ${node.swift_syntax_kind}(${node.name})
 %   end
 % end
-
-  public var nameForDiagnostics: String? {
-    switch self {
-    case .unknown:
-      return nil
-    case .token:
-      return "token"
-% for node in NON_BASE_SYNTAX_NODES:
-    case .${node.swift_syntax_kind}:
-%   if node.name_for_diagnostics:
-      return "${node.name_for_diagnostics}"
-%   else:
-      return nil
-%   end
-% end
-    }
-  }
 }
 
 public extension Syntax {

Sources/SwiftSyntax/SyntaxKind.swift.gyb

@@ -19,7 +19,6 @@
 //===----------------------------------------------------------------------===//
 
 /// Enumerates the known kinds of Syntax represented in the Syntax tree.
-@_spi(RawSyntax)
 public enum SyntaxKind {
   case token
   case unknown