Simplify Misc.swift.gyb

Author: ahoppen

Sources/SwiftSyntax/Misc.swift.gyb

@@ -20,29 +20,6 @@
 //===----------------------------------------------------------------------===//
 
 extension Syntax {
-  /// Syntax nodes always conform to SyntaxProtocol. This API is just added
-  /// for consistency.
-  /// Note that this will incur an existential conversion.
-  @available(*, deprecated, message: "Expression always evaluates to true")
-  public func isProtocol(_: SyntaxProtocol.Protocol) -> Bool {
-    return true
-  }
-
-  /// Return the non-type erased version of this syntax node.
-  /// Note that this will incur an existential conversion.
-  public func asProtocol(_: SyntaxProtocol.Protocol) -> SyntaxProtocol {
-    switch self.as(SyntaxEnum.self) {
-    case .token(let node):
-      return node
-    case .unknown(let node):
-      return node
-% for node in NON_BASE_SYNTAX_NODES:
-    case .${node.swift_syntax_kind}(let node):
-      return node
-% end
-    }
-  }
-
   public static var structure: SyntaxNodeStructure {
     return .choices([
       .node(UnknownSyntax.self),
@@ -56,19 +33,6 @@ extension Syntax {
 % end
     ])
   }
-
-  public func childNameForDiagnostics(_ index: SyntaxChildrenIndex) -> String? {
-    switch self.as(SyntaxEnum.self) {
-    case .token(let node):
-      return node.childNameForDiagnostics(index)
-    case .unknown(let node):
-      return node.childNameForDiagnostics(index)
-% for node in NON_BASE_SYNTAX_NODES:
-    case .${node.swift_syntax_kind}(let node):
-      return node.childNameForDiagnostics(index)
-% end
-    }
-  }
 }
 
 extension SyntaxKind {

Sources/SwiftSyntax/Syntax.swift

@@ -87,6 +87,24 @@ public struct Syntax: SyntaxProtocol, SyntaxHashable {
     self = syntax._syntaxNode
   }
 
+  /// Syntax nodes always conform to SyntaxProtocol. This API is just added
+  /// for consistency.
+  /// Note that this will incur an existential conversion.
+  @available(*, deprecated, message: "Expression always evaluates to true")
+  public func isProtocol(_: SyntaxProtocol.Protocol) -> Bool {
+    return true
+  }
+
+  /// Return the non-type erased version of this syntax node.
+  /// Note that this will incur an existential conversion.
+  public func asProtocol(_: SyntaxProtocol.Protocol) -> SyntaxProtocol {
+    return self.raw.kind.syntaxNodeType.init(self)!
+  }
+
+  public func childNameForDiagnostics(_ index: SyntaxChildrenIndex) -> String? {
+    return self.raw.kind.syntaxNodeType.init(self)!.childNameForDiagnostics(index)
+  }
+
   public func hash(into hasher: inout Hasher) {
     return data.nodeId.hash(into: &hasher)
   }