Last PR Fix

leogdion · leogdion · commit f52b64e67096 · 2025-09-16T12:00:20.000-04:00
diff --git a/Sources/TokenVisitor/Syntax.swift b/Sources/TokenVisitor/Syntax.swift
@@ -36,7 +36,7 @@ extension Syntax {
   /// If the node's type conforms to `SyntaxClassifiable`, returns its static
   /// `syntaxType`. Otherwise, returns `.other`.
   internal var syntaxType: SyntaxType {
-    if let classifiable = type(of: self) as? any SyntaxClassifiable.Type {
+    if let classifiable = self.syntaxNodeType as? any SyntaxClassifiable.Type {
       return classifiable.syntaxType
     }
     return .other
diff --git a/Sources/TokenVisitor/SyntaxClassifiable.swift b/Sources/TokenVisitor/SyntaxClassifiable.swift
@@ -28,7 +28,7 @@
 //
 
 import Foundation
-@_spi(RawSyntax) import SwiftSyntax
+import SwiftSyntax
 
 /// Protocol for syntax nodes that can classify themselves by their semantic role.
 ///
diff --git a/Sources/TokenVisitor/SyntaxClassifiable/AttributeListSyntax.swift b/Sources/TokenVisitor/SyntaxClassifiable/AttributeListSyntax.swift
@@ -1,5 +1,5 @@
 //
-//  AttributeListSyntax+SyntaxClassifiable.swift
+//  AttributeListSyntax.swift
 //  SyntaxKit
 //
 //  Created by Leo Dion.
@@ -28,7 +28,7 @@
 //
 
 import Foundation
-@_spi(RawSyntax) import SwiftSyntax
+import SwiftSyntax
 
 /// Extension for AttributeListSyntax to conform to SyntaxClassifiable.
 extension AttributeListSyntax: SyntaxClassifiable {
diff --git a/Sources/TokenVisitor/SyntaxClassifiable/CatchClauseListSyntax.swift b/Sources/TokenVisitor/SyntaxClassifiable/CatchClauseListSyntax.swift
@@ -1,5 +1,5 @@
 //
-//  CatchClauseListSyntax+SyntaxClassifiable.swift
+//  CatchClauseListSyntax.swift
 //  SyntaxKit
 //
 //  Created by Leo Dion.
@@ -28,7 +28,7 @@
 //
 
 import Foundation
-@_spi(RawSyntax) import SwiftSyntax
+import SwiftSyntax
 
 /// Extension for CatchClauseListSyntax to conform to SyntaxClassifiable.
 extension CatchClauseListSyntax: SyntaxClassifiable {
diff --git a/Sources/TokenVisitor/SyntaxClassifiable/CodeBlockItemListSyntax.swift b/Sources/TokenVisitor/SyntaxClassifiable/CodeBlockItemListSyntax.swift
@@ -1,5 +1,5 @@
 //
-//  CodeBlockItemListSyntax+SyntaxClassifiable.swift
+//  CodeBlockItemListSyntax.swift
 //  SyntaxKit
 //
 //  Created by Leo Dion.
@@ -28,7 +28,7 @@
 //
 
 import Foundation
-@_spi(RawSyntax) import SwiftSyntax
+import SwiftSyntax
 
 /// Extension for CodeBlockItemListSyntax to conform to SyntaxClassifiable.
 extension CodeBlockItemListSyntax: SyntaxClassifiable {
diff --git a/Sources/TokenVisitor/SyntaxClassifiable/ConditionElementListSyntax.swift b/Sources/TokenVisitor/SyntaxClassifiable/ConditionElementListSyntax.swift
@@ -1,5 +1,5 @@
 //
-//  ConditionElementListSyntax+SyntaxClassifiable.swift
+//  ConditionElementListSyntax.swift
 //  SyntaxKit
 //
 //  Created by Leo Dion.
@@ -28,7 +28,7 @@
 //
 
 import Foundation
-@_spi(RawSyntax) import SwiftSyntax
+import SwiftSyntax
 
 /// Extension for ConditionElementListSyntax to conform to SyntaxClassifiable.
 extension ConditionElementListSyntax: SyntaxClassifiable {
diff --git a/Sources/TokenVisitor/SyntaxClassifiable/DeclModifierListSyntax.swift b/Sources/TokenVisitor/SyntaxClassifiable/DeclModifierListSyntax.swift
@@ -1,5 +1,5 @@
 //
-//  DeclModifierListSyntax+SyntaxClassifiable.swift
+//  DeclModifierListSyntax.swift
 //  SyntaxKit
 //
 //  Created by Leo Dion.
@@ -28,7 +28,7 @@
 //
 
 import Foundation
-@_spi(RawSyntax) import SwiftSyntax
+import SwiftSyntax
 
 /// Extension for DeclModifierListSyntax to conform to SyntaxClassifiable.
 extension DeclModifierListSyntax: SyntaxClassifiable {
diff --git a/Sources/TokenVisitor/SyntaxClassifiable/DeclSyntax.swift b/Sources/TokenVisitor/SyntaxClassifiable/DeclSyntax.swift
@@ -1,5 +1,5 @@
 //
-//  DeclSyntax+SyntaxClassifiable.swift
+//  DeclSyntax.swift
 //  SyntaxKit
 //
 //  Created by Leo Dion.
@@ -28,7 +28,7 @@
 //
 
 import Foundation
-@_spi(RawSyntax) import SwiftSyntax
+import SwiftSyntax
 
 extension DeclSyntax: SyntaxClassifiable {
   /// Declarations are classified as `.decl` type.
diff --git a/Sources/TokenVisitor/SyntaxClassifiable/ExprSyntax.swift b/Sources/TokenVisitor/SyntaxClassifiable/ExprSyntax.swift
@@ -1,5 +1,5 @@
 //
-//  ExprSyntax+SyntaxClassifiable.swift
+//  ExprSyntax.swift
 //  SyntaxKit
 //
 //  Created by Leo Dion.
@@ -28,7 +28,7 @@
 //
 
 import Foundation
-@_spi(RawSyntax) import SwiftSyntax
+import SwiftSyntax
 
 extension ExprSyntax: SyntaxClassifiable {
   /// Expressions are classified as `.expr` type.
diff --git a/Sources/TokenVisitor/SyntaxClassifiable/FunctionParameterListSyntax.swift b/Sources/TokenVisitor/SyntaxClassifiable/FunctionParameterListSyntax.swift
@@ -1,5 +1,5 @@
 //
-//  FunctionParameterListSyntax+SyntaxClassifiable.swift
+//  FunctionParameterListSyntax.swift
 //  SyntaxKit
 //
 //  Created by Leo Dion.
@@ -28,7 +28,7 @@
 //
 
 import Foundation
-@_spi(RawSyntax) import SwiftSyntax
+import SwiftSyntax
 
 /// Extension for FunctionParameterListSyntax to conform to SyntaxClassifiable.
 extension FunctionParameterListSyntax: SyntaxClassifiable {
diff --git a/Sources/TokenVisitor/SyntaxClassifiable/IdentifierPatternSyntax.swift b/Sources/TokenVisitor/SyntaxClassifiable/IdentifierPatternSyntax.swift
@@ -0,0 +1,36 @@
+//
+//  IdentifierPatternSyntax.swift
+//  SyntaxKit
+//
+//  Created by Leo Dion.
+//  Copyright © 2025 BrightDigit.
+//
+//  Permission is hereby granted, free of charge, to any person
+//  obtaining a copy of this software and associated documentation
+//  files (the “Software”), to deal in the Software without
+//  restriction, including without limitation the rights to use,
+//  copy, modify, merge, publish, distribute, sublicense, and/or
+//  sell copies of the Software, and to permit persons to whom the
+//  Software is furnished to do so, subject to the following
+//  conditions:
+//
+//  The above copyright notice and this permission notice shall be
+//  included in all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+//  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+//  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+//  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+//  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//  OTHER DEALINGS IN THE SOFTWARE.
+//
+
+import SwiftSyntax
+
+extension IdentifierPatternSyntax: SyntaxClassifiable {
+  static var syntaxType: SyntaxType {
+    .pattern
+  }
+}
diff --git a/Sources/TokenVisitor/SyntaxClassifiable/IdentifierTypeSyntax.swift b/Sources/TokenVisitor/SyntaxClassifiable/IdentifierTypeSyntax.swift
@@ -0,0 +1,36 @@
+//
+//  IdentifierTypeSyntax.swift
+//  SyntaxKit
+//
+//  Created by Leo Dion.
+//  Copyright © 2025 BrightDigit.
+//
+//  Permission is hereby granted, free of charge, to any person
+//  obtaining a copy of this software and associated documentation
+//  files (the “Software”), to deal in the Software without
+//  restriction, including without limitation the rights to use,
+//  copy, modify, merge, publish, distribute, sublicense, and/or
+//  sell copies of the Software, and to permit persons to whom the
+//  Software is furnished to do so, subject to the following
+//  conditions:
+//
+//  The above copyright notice and this permission notice shall be
+//  included in all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+//  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+//  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+//  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+//  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//  OTHER DEALINGS IN THE SOFTWARE.
+//
+
+import SwiftSyntax
+
+extension IdentifierTypeSyntax: SyntaxClassifiable {
+  static var syntaxType: SyntaxType {
+    .type
+  }
+}
diff --git a/Sources/TokenVisitor/SyntaxClassifiable/LabeledExprListSyntax.swift b/Sources/TokenVisitor/SyntaxClassifiable/LabeledExprListSyntax.swift
@@ -1,5 +1,5 @@
 //
-//  LabeledExprListSyntax+SyntaxClassifiable.swift
+//  LabeledExprListSyntax.swift
 //  SyntaxKit
 //
 //  Created by Leo Dion.
@@ -28,7 +28,7 @@
 //
 
 import Foundation
-@_spi(RawSyntax) import SwiftSyntax
+import SwiftSyntax
 
 /// Extension for LabeledExprListSyntax to conform to SyntaxClassifiable.
 extension LabeledExprListSyntax: SyntaxClassifiable {
diff --git a/Sources/TokenVisitor/SyntaxClassifiable/PatternBindingListSyntax.swift b/Sources/TokenVisitor/SyntaxClassifiable/PatternBindingListSyntax.swift
@@ -1,5 +1,5 @@
 //
-//  PatternBindingListSyntax+SyntaxClassifiable.swift
+//  PatternBindingListSyntax.swift
 //  SyntaxKit
 //
 //  Created by Leo Dion.
@@ -28,7 +28,7 @@
 //
 
 import Foundation
-@_spi(RawSyntax) import SwiftSyntax
+import SwiftSyntax
 
 /// Extension for PatternBindingListSyntax to conform to SyntaxClassifiable.
 extension PatternBindingListSyntax: SyntaxClassifiable {
diff --git a/Sources/TokenVisitor/SyntaxClassifiable/PatternSyntax.swift b/Sources/TokenVisitor/SyntaxClassifiable/PatternSyntax.swift
@@ -1,5 +1,5 @@
 //
-//  PatternSyntax+SyntaxClassifiable.swift
+//  PatternSyntax.swift
 //  SyntaxKit
 //
 //  Created by Leo Dion.
@@ -28,7 +28,7 @@
 //
 
 import Foundation
-@_spi(RawSyntax) import SwiftSyntax
+import SwiftSyntax
 
 extension PatternSyntax: SyntaxClassifiable {
   /// Patterns are classified as `.pattern` type.
diff --git a/Sources/TokenVisitor/SyntaxClassifiable/SwitchCaseItemListSyntax.swift b/Sources/TokenVisitor/SyntaxClassifiable/SwitchCaseItemListSyntax.swift
@@ -1,5 +1,5 @@
 //
-//  SwitchCaseItemListSyntax+SyntaxClassifiable.swift
+//  SwitchCaseItemListSyntax.swift
 //  SyntaxKit
 //
 //  Created by Leo Dion.
@@ -28,7 +28,7 @@
 //
 
 import Foundation
-@_spi(RawSyntax) import SwiftSyntax
+import SwiftSyntax
 
 /// Extension for SwitchCaseItemListSyntax to conform to SyntaxClassifiable.
 extension SwitchCaseItemListSyntax: SyntaxClassifiable {
diff --git a/Sources/TokenVisitor/SyntaxClassifiable/SwitchCaseListSyntax.swift b/Sources/TokenVisitor/SyntaxClassifiable/SwitchCaseListSyntax.swift
@@ -1,5 +1,5 @@
 //
-//  SwitchCaseListSyntax+SyntaxClassifiable.swift
+//  SwitchCaseListSyntax.swift
 //  SyntaxKit
 //
 //  Created by Leo Dion.
@@ -28,7 +28,7 @@
 //
 
 import Foundation
-@_spi(RawSyntax) import SwiftSyntax
+import SwiftSyntax
 
 /// Extension for SwitchCaseListSyntax to conform to SyntaxClassifiable.
 extension SwitchCaseListSyntax: SyntaxClassifiable {
diff --git a/Sources/TokenVisitor/SyntaxClassifiable/TypeSyntax.swift b/Sources/TokenVisitor/SyntaxClassifiable/TypeSyntax.swift
@@ -1,5 +1,5 @@
 //
-//  TypeSyntax+SyntaxClassifiable.swift
+//  TypeSyntax.swift
 //  SyntaxKit
 //
 //  Created by Leo Dion.
@@ -28,7 +28,7 @@
 //
 
 import Foundation
-@_spi(RawSyntax) import SwiftSyntax
+import SwiftSyntax
 
 extension TypeSyntax: SyntaxClassifiable {
   /// Types are classified as `.type` type.
diff --git a/Sources/TokenVisitor/SyntaxClassifiable/VariableDeclSyntax.swift b/Sources/TokenVisitor/SyntaxClassifiable/VariableDeclSyntax.swift
@@ -0,0 +1,36 @@
+//
+//  VariableDeclSyntax.swift
+//  SyntaxKit
+//
+//  Created by Leo Dion.
+//  Copyright © 2025 BrightDigit.
+//
+//  Permission is hereby granted, free of charge, to any person
+//  obtaining a copy of this software and associated documentation
+//  files (the “Software”), to deal in the Software without
+//  restriction, including without limitation the rights to use,
+//  copy, modify, merge, publish, distribute, sublicense, and/or
+//  sell copies of the Software, and to permit persons to whom the
+//  Software is furnished to do so, subject to the following
+//  conditions:
+//
+//  The above copyright notice and this permission notice shall be
+//  included in all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+//  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+//  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+//  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+//  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//  OTHER DEALINGS IN THE SOFTWARE.
+//
+
+import SwiftSyntax
+
+extension VariableDeclSyntax: SyntaxClassifiable {
+  static var syntaxType: SyntaxType {
+    .decl
+  }
+}
diff --git a/Sources/TokenVisitor/TokenVisitor.swift b/Sources/TokenVisitor/TokenVisitor.swift
@@ -28,7 +28,7 @@
 //
 
 import Foundation
-@_spi(RawSyntax) import SwiftSyntax
+import SwiftSyntax
 
 /// AST visitor that transforms SwiftSyntax nodes into a simplified tree structure for JSON serialization.
 ///
diff --git a/Sources/TokenVisitor/TriviaPiece.swift b/Sources/TokenVisitor/TriviaPiece.swift
@@ -28,7 +28,7 @@
 //
 
 import Foundation
-@_spi(RawSyntax) import SwiftSyntax
+import SwiftSyntax
 
 // MARK: - TriviaPiece Extension
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ extension Syntax {`
`36`	`36`	/// If the node's type conforms to `SyntaxClassifiable`, returns its static
`37`	`37`	/// `syntaxType`. Otherwise, returns `.other`.
`38`	`38`	`internal var syntaxType: SyntaxType {`
`39`		`- if let classifiable = type(of: self) as? any SyntaxClassifiable.Type {`
	`39`	`+ if let classifiable = self.syntaxNodeType as? any SyntaxClassifiable.Type {`
`40`	`40`	`return classifiable.syntaxType`
`41`	`41`	`}`
`42`	`42`	`return .other`