Remove redundant typealias

Author: krzyzanowskim

Sources/SKTestSupport/Array+SyntaxHighlightingToken.swift

@@ -37,8 +37,8 @@ extension Array where Element == SyntaxHighlightingToken {
         current.utf16index = charDelta
       }
 
-      let kind = SyntaxHighlightingToken.Kind.all[Int(rawKind)]
-      let modifiers = SyntaxHighlightingToken.Modifiers(rawValue: rawModifiers)
+      let kind = SemanticTokenTypes.all[Int(rawKind)]
+      let modifiers = SemanticTokenModifiers(rawValue: rawModifiers)
 
       append(
         SyntaxHighlightingToken(

Sources/SourceKitLSP/Swift/SemanticTokens.swift

@@ -129,7 +129,7 @@ extension SyntaxClassifiedRange {
 }
 
 extension SyntaxClassification {
-  fileprivate var highlightingKindAndModifiers: (SyntaxHighlightingToken.Kind, SyntaxHighlightingToken.Modifiers)? {
+  fileprivate var highlightingKindAndModifiers: (SemanticTokenTypes, SemanticTokenModifiers)? {
     switch self {
     case .none:
       return nil

Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift

@@ -231,8 +231,8 @@ extension SwiftLanguageServer {
         ),
         semanticTokensProvider: SemanticTokensOptions(
           legend: SemanticTokensLegend(
-            tokenTypes: SyntaxHighlightingToken.Kind.all.map(\.name),
-            tokenModifiers: SyntaxHighlightingToken.Modifiers.all.compactMap(\.name)
+            tokenTypes: SemanticTokenTypes.all.map(\.name),
+            tokenModifiers: SemanticTokenModifiers.all.compactMap(\.name)
           ),
           range: .bool(true),
           full: .bool(true)

Sources/SourceKitLSP/Swift/SyntaxHighlightingToken.swift

@@ -23,9 +23,9 @@ public struct SyntaxHighlightingToken: Hashable {
     }
   }
   /// The token type.
-  public var kind: Kind
+  public var kind: SemanticTokenTypes
   /// Additional metadata about the token.
-  public var modifiers: Modifiers
+  public var modifiers: SemanticTokenModifiers
 
   /// The (inclusive) start position of the token.
   public var start: Position { range.lowerBound }
@@ -34,21 +34,18 @@ public struct SyntaxHighlightingToken: Hashable {
   /// The length of the token in UTF-16 code units.
   public var utf16length: Int { end.utf16index - start.utf16index }
 
-  public init(range: Range<Position>, kind: Kind, modifiers: Modifiers = []) {
+  public init(range: Range<Position>, kind: SemanticTokenTypes, modifiers: SemanticTokenModifiers = []) {
     assert(range.lowerBound.line == range.upperBound.line)
 
     self.range = range
     self.kind = kind
     self.modifiers = modifiers
   }
 
-  public init(start: Position, utf16length: Int, kind: Kind, modifiers: Modifiers = []) {
+  public init(start: Position, utf16length: Int, kind: SemanticTokenTypes, modifiers: SemanticTokenModifiers = []) {
     let range = start..<Position(line: start.line, utf16index: start.utf16index + utf16length)
     self.init(range: range, kind: kind, modifiers: modifiers)
   }
-
-  public typealias Kind = SemanticTokenTypes
-  public typealias Modifiers = SemanticTokenModifiers
 }
 
 extension Array where Element == SyntaxHighlightingToken {

Sources/SourceKitLSP/Swift/SyntaxHighlightingTokenParser.swift

@@ -86,7 +86,7 @@ struct SyntaxHighlightingTokenParser {
 
   private func parseKindAndModifiers(
     _ uid: sourcekitd_uid_t
-  ) -> (SyntaxHighlightingToken.Kind, SyntaxHighlightingToken.Modifiers)? {
+  ) -> (SemanticTokenTypes, SemanticTokenModifiers)? {
     let api = sourcekitd.api
     let values = sourcekitd.values
     switch uid {

Tests/SourceKitLSPTests/SemanticTokensTests.swift

@@ -53,8 +53,8 @@ final class SemanticTokensTests: XCTestCase {
               range: .bool(true),
               full: .bool(true)
             ),
-            tokenTypes: Token.Kind.all.map(\.name),
-            tokenModifiers: Token.Modifiers.all.compactMap(\.name),
+            tokenTypes: SemanticTokenTypes.all.map(\.name),
+            tokenModifiers: SemanticTokenModifiers.all.compactMap(\.name),
             formats: [.relative]
           )
         )
@@ -176,14 +176,14 @@ final class SemanticTokensTests: XCTestCase {
         2,  // line delta
         3,  // char delta
         5,  // length
-        Token.Kind.string.tokenType,  // kind
+        SemanticTokenTypes.string.tokenType,  // kind
         0,  // modifiers
 
         2,  // line delta
         2,  // char delta
         1,  // length
-        Token.Kind.interface.tokenType,  // kind
-        Token.Modifiers.deprecated.rawValue | Token.Modifiers.definition.rawValue,  // modifiers
+        SemanticTokenTypes.interface.tokenType,  // kind
+        SemanticTokenModifiers.deprecated.rawValue | SemanticTokenModifiers.definition.rawValue,  // modifiers
       ]
     )
 
@@ -886,8 +886,8 @@ extension Token {
     line: Int,
     utf16index: Int,
     length: Int,
-    kind: Token.Kind,
-    modifiers: Token.Modifiers = []
+    kind: SemanticTokenTypes,
+    modifiers: SemanticTokenModifiers = []
   ) {
     self.init(
       start: Position(line: line, utf16index: utf16index),