Remove isToken and isCollection from SyntaxProtocol

These getters were redundant with other ways to check the properties.

Author: ahoppen

Sources/SwiftParserDiagnostics/MissingNodesError.swift

@@ -347,7 +347,7 @@ extension ParseDiagnosticsGenerator {
           missingNodes += [sibling]
         } else if sibling.isMissingAllTokens && sibling.hasTokens {
           missingNodes += [sibling]
-        } else if sibling.isCollection && sibling.children(viewMode: .sourceAccurate).count == 0 {
+        } else if sibling.kind.isSyntaxCollection && sibling.children(viewMode: .sourceAccurate).count == 0 {
           // Skip over any syntax collections without any elements while looking ahead for further missing nodes.
         } else {
           // Otherwise we have found a present node, so stop looking ahead.

Sources/SwiftSyntax/Syntax.swift

@@ -243,19 +243,6 @@ public extension SyntaxProtocol {
     return SyntaxChildrenIndex(self.data.absoluteInfo)
   }
 
-  /// Whether or not this node is a token one.
-  var isToken: Bool {
-    return raw.isToken
-  }
-
-  /// Whether or not this node represents an SyntaxCollection.
-  var isCollection: Bool {
-    // We need to provide a custom implementation for is(SyntaxCollection.self)
-    // since SyntaxCollection has generic or self requirements and can thus
-    // not be used as a method argument.
-    return raw.kind.isSyntaxCollection
-  }
-
   /// Whether the tree contained by this layout has any
   ///  - missing nodes or
   ///  - unexpected nodes or

Sources/_SwiftSyntaxTestSupport/SyntaxComparison.swift

@@ -118,7 +118,7 @@ public extension SyntaxProtocol {
       return .nodeType
     }
 
-    if isToken {
+    if self.is(TokenSyntax.self) {
       if let token = Syntax(self).as(TokenSyntax.self), let baselineToken = Syntax(baseline).as(TokenSyntax.self) {
         if token.presence != baselineToken.presence {
           return .presence

Sources/_SwiftSyntaxTestSupport/SyntaxProtocol+Initializer.swift

@@ -114,7 +114,7 @@ extension SyntaxProtocol {
 
   private func debugInitCallExpr(includeTrivia: Bool) -> ExprSyntax {
     let mirror = Mirror(reflecting: self)
-    if self.isCollection {
+    if self.kind.isSyntaxCollection {
       let typeName = String(describing: type(of: self))
       return ExprSyntax(
         FunctionCallExprSyntax(callee: IdentifierExprSyntax(identifier: .identifier(typeName))) {

Tests/SwiftSyntaxTest/SyntaxCollectionsTests.swift

@@ -29,7 +29,7 @@ public class SyntaxCollectionsTests: XCTestCase {
     ])
 
     let newArrayElementList = arrayElementList.appending(integerLiteralElement(1))
-    XCTAssert(newArrayElementList.isCollection)
+    XCTAssert(newArrayElementList.kind.isSyntaxCollection)
     XCTAssertEqual(newArrayElementList.count, 2)
     XCTAssertNotNil(newArrayElementList.child(at: 1))
     XCTAssert(!newArrayElementList.child(at: 1)!.isCollection)