Fixup DocumentTestDiscoveryTests, make TestStyle an enum

Author: plemarquand

Sources/LanguageServerProtocol/SupportTypes/TestItem.swift

@@ -19,6 +19,15 @@ public struct TestTag: Codable, Equatable, Sendable {
   }
 }
 
+/// An enum representing the different styles of tests that can be found in a document.
+public enum TestStyle: String, Codable, Sendable {
+  /// XCTest: https://developer.apple.com/documentation/xctest
+  case xcTest = "XCTest"
+
+  /// Swift Testing: https://swiftpackageindex.com/apple/swift-testing/main/documentation/testing
+  case swiftTesting = "swift-testing"
+}
+
 /// A test item that can be shown an a client's test explorer or used to identify tests alongside a source file.
 ///
 /// A `TestItem` can represent either a test suite or a test itself, since they both have similar capabilities.
@@ -43,7 +52,7 @@ public struct TestItem: ResponseType, Equatable {
   public var disabled: Bool
 
   /// The type of test, eg. the testing framework that was used to declare the test.
-  public var style: String
+  public var style: TestStyle
 
   /// The location of the test item in the source code.
   public var location: Location
@@ -62,7 +71,7 @@ public struct TestItem: ResponseType, Equatable {
     description: String? = nil,
     sortText: String? = nil,
     disabled: Bool,
-    style: String,
+    style: TestStyle,
     location: Location,
     children: [TestItem],
     tags: [TestTag]

Sources/SourceKitLSP/Swift/SwiftTestingScanner.swift

@@ -257,7 +257,7 @@ final class SyntacticSwiftTestingTestScanner: SyntaxVisitor {
         id: (parentTypeNames + typeNames).joined(separator: "/"),
         label: attributeData?.displayName ?? typeNames.last!,
         disabled: (attributeData?.isDisabled ?? false) || allTestsDisabled,
-        style: TestStyle.swiftTesting,
+        style: .swiftTesting,
         location: Location(uri: snapshot.uri, range: range),
         children: memberScanner.result.map(\.testItem),
         tags: attributeData?.tags.map(TestTag.init(id:)) ?? []
@@ -330,7 +330,7 @@ final class SyntacticSwiftTestingTestScanner: SyntaxVisitor {
         id: (parentTypeNames + [name]).joined(separator: "/"),
         label: attributeData.displayName ?? name,
         disabled: attributeData.isDisabled || allTestsDisabled,
-        style: TestStyle.swiftTesting,
+        style: .swiftTesting,
         location: Location(uri: snapshot.uri, range: range),
         children: [],
         tags: attributeData.tags.map(TestTag.init(id:))

Sources/SourceKitLSP/Swift/SyntacticSwiftXCTestScanner.swift

@@ -72,7 +72,7 @@ final class SyntacticSwiftXCTestScanner: SyntaxVisitor {
         id: "\(containerName)/\(function.name.text)()",
         label: "\(function.name.text)()",
         disabled: false,
-        style: TestStyle.xcTest,
+        style: .xcTest,
         location: Location(uri: snapshot.uri, range: range),
         children: [],
         tags: []
@@ -106,7 +106,7 @@ final class SyntacticSwiftXCTestScanner: SyntaxVisitor {
         id: node.name.text,
         label: node.name.text,
         disabled: false,
-        style: TestStyle.xcTest,
+        style: .xcTest,
         location: Location(uri: snapshot.uri, range: range),
         children: testMethods,
         tags: []

Sources/SourceKitLSP/TestDiscovery.swift

@@ -16,11 +16,6 @@ import LanguageServerProtocol
 import SemanticIndex
 import SwiftSyntax
 
-public enum TestStyle {
-  public static let xcTest = "XCTest"
-  public static let swiftTesting = "swift-testing"
-}
-
 fileprivate extension SymbolOccurrence {
   /// Assuming that this is a symbol occurrence returned by the index, return whether it can constitute the definition
   /// of a test case.
@@ -155,7 +150,7 @@ extension SourceKitLSPServer {
           id: id,
           label: testSymbolOccurrence.symbol.name,
           disabled: false,
-          style: TestStyle.xcTest,
+          style: .xcTest,
           location: location,
           children: children.map(\.testItem),
           tags: []
@@ -221,7 +216,7 @@ extension SourceKitLSPServer {
       testsFromSyntacticIndex
       .compactMap { (item) -> AnnotatedTestItem? in
         let testItem = item.testItem
-        if testItem.style == TestStyle.swiftTesting {
+        if testItem.style == .swiftTesting {
           // Swift-testing tests aren't part of the semantic index. Always include them.
           return item
         }
@@ -297,7 +292,7 @@ extension SourceKitLSPServer {
 
     if let index = workspace.index(checkedFor: indexCheckLevel) {
       var syntacticSwiftTestingTests: [AnnotatedTestItem] {
-        syntacticTests?.filter { $0.testItem.style == TestStyle.swiftTesting } ?? []
+        syntacticTests?.filter { $0.testItem.style == .swiftTesting } ?? []
       }
 
       let testSymbols =