Merge pull request #1305 from ahoppen/6.0/revert-test-item-extension-merging

Revert #1227

Author: ahoppen

Sources/SourceKitLSP/LanguageService.swift

@@ -200,7 +200,7 @@ public protocol LanguageService: AnyObject, Sendable {
   /// This is used as a fallback to show the test cases in a file if the index for a given file is not up-to-date.
   ///
   /// A return value of `nil` indicates that this language service does not support syntactic test discovery.
-  func syntacticDocumentTests(for uri: DocumentURI, in workspace: Workspace) async throws -> [AnnotatedTestItem]?
+  func syntacticDocumentTests(for uri: DocumentURI, in workspace: Workspace) async throws -> [TestItem]?
 
   /// Crash the language server. Should be used for crash recovery testing only.
   func _crash() async

Sources/SourceKitLSP/Swift/SwiftTestingScanner.swift

@@ -177,13 +177,9 @@ final class SyntacticSwiftTestingTestScanner: SyntaxVisitor {
   private let parentTypeNames: [String]
 
   /// The discovered test items.
-  private var result: [AnnotatedTestItem] = []
+  private var result: [TestItem] = []
 
-  private init(
-    snapshot: DocumentSnapshot,
-    allTestsDisabled: Bool,
-    parentTypeNames: [String]
-  ) {
+  private init(snapshot: DocumentSnapshot, allTestsDisabled: Bool, parentTypeNames: [String]) {
     self.snapshot = snapshot
     self.allTestsDisabled = allTestsDisabled
     self.parentTypeNames = parentTypeNames
@@ -194,7 +190,7 @@ final class SyntacticSwiftTestingTestScanner: SyntaxVisitor {
   public static func findTestSymbols(
     in snapshot: DocumentSnapshot,
     syntaxTreeManager: SyntaxTreeManager
-  ) async -> [AnnotatedTestItem] {
+  ) async -> [TestItem] {
     guard snapshot.text.contains("Suite") || snapshot.text.contains("Test") else {
       // If the file contains swift-testing tests, it must contain a `@Suite` or `@Test` attribute.
       // Only check for the attribute name because the attribute may be module qualified and contain an arbitrary amount
@@ -203,11 +199,7 @@ final class SyntacticSwiftTestingTestScanner: SyntaxVisitor {
       return []
     }
     let syntaxTree = await syntaxTreeManager.syntaxTree(for: snapshot)
-    let visitor = SyntacticSwiftTestingTestScanner(
-      snapshot: snapshot,
-      allTestsDisabled: false,
-      parentTypeNames: []
-    )
+    let visitor = SyntacticSwiftTestingTestScanner(snapshot: snapshot, allTestsDisabled: false, parentTypeNames: [])
     visitor.walk(syntaxTree)
     return visitor.result
   }
@@ -249,18 +241,14 @@ final class SyntacticSwiftTestingTestScanner: SyntaxVisitor {
     }
 
     let range = snapshot.range(of: node.positionAfterSkippingLeadingTrivia..<node.endPositionBeforeTrailingTrivia)
-    // Members won't be extensions since extensions will only be at the top level.
-    let testItem = AnnotatedTestItem(
-      testItem: TestItem(
-        id: (parentTypeNames + typeNames).joined(separator: "/"),
-        label: attributeData?.displayName ?? typeNames.last!,
-        disabled: (attributeData?.isDisabled ?? false) || allTestsDisabled,
-        style: TestStyle.swiftTesting,
-        location: Location(uri: snapshot.uri, range: range),
-        children: memberScanner.result.map(\.testItem),
-        tags: attributeData?.tags.map(TestTag.init(id:)) ?? []
-      ),
-      isExtension: node.is(ExtensionDeclSyntax.self)
+    let testItem = TestItem(
+      id: (parentTypeNames + typeNames).joined(separator: "/"),
+      label: attributeData?.displayName ?? typeNames.last!,
+      disabled: (attributeData?.isDisabled ?? false) || allTestsDisabled,
+      style: TestStyle.swiftTesting,
+      location: Location(uri: snapshot.uri, range: range),
+      children: memberScanner.result,
+      tags: attributeData?.tags.map(TestTag.init(id:)) ?? []
     )
     result.append(testItem)
     return .skipChildren
@@ -307,17 +295,14 @@ final class SyntacticSwiftTestingTestScanner: SyntaxVisitor {
       node.name.text + "(" + node.signature.parameterClause.parameters.map { "\($0.firstName.text):" }.joined() + ")"
 
     let range = snapshot.range(of: node.positionAfterSkippingLeadingTrivia..<node.endPositionBeforeTrailingTrivia)
-    let testItem = AnnotatedTestItem(
-      testItem: TestItem(
-        id: (parentTypeNames + [name]).joined(separator: "/"),
-        label: attributeData.displayName ?? name,
-        disabled: attributeData.isDisabled || allTestsDisabled,
-        style: TestStyle.swiftTesting,
-        location: Location(uri: snapshot.uri, range: range),
-        children: [],
-        tags: attributeData.tags.map(TestTag.init(id:))
-      ),
-      isExtension: false
+    let testItem = TestItem(
+      id: (parentTypeNames + [name]).joined(separator: "/"),
+      label: attributeData.displayName ?? name,
+      disabled: attributeData.isDisabled || allTestsDisabled,
+      style: TestStyle.swiftTesting,
+      location: Location(uri: snapshot.uri, range: range),
+      children: [],
+      tags: attributeData.tags.map(TestTag.init(id:))
     )
     result.append(testItem)
     return .visitChildren

Sources/SourceKitLSP/Swift/SyntacticTestIndex.swift

@@ -51,7 +51,7 @@ fileprivate enum TaskMetadata: DependencyTracker, Equatable {
 /// Data from a syntactic scan of a source file for tests.
 fileprivate struct IndexedTests {
   /// The tests within the source file.
-  let tests: [AnnotatedTestItem]
+  let tests: [TestItem]
 
   /// The modification date of the source file when it was scanned. A file won't get re-scanned if its modification date
   /// is older or the same as this date.
@@ -63,7 +63,7 @@ fileprivate struct IndexedTests {
 /// Does not write the results to the index.
 ///
 /// The order of the returned tests is not defined. The results should be sorted before being returned to the editor.
-fileprivate func testItems(in url: URL) async -> [AnnotatedTestItem] {
+fileprivate func testItems(in url: URL) async -> [TestItem] {
   guard url.pathExtension == "swift" else {
     return []
   }
@@ -79,7 +79,6 @@ fileprivate func testItems(in url: URL) async -> [AnnotatedTestItem] {
     syntaxTreeManager: syntaxTreeManager
   )
   async let xcTests = SyntacticSwiftXCTestScanner.findTestSymbols(in: snapshot, syntaxTreeManager: syntaxTreeManager)
-
   return await swiftTestingTests + xcTests
 }
 
@@ -207,7 +206,7 @@ actor SyntacticTestIndex {
   /// Gets all the tests in the syntactic index.
   ///
   /// This waits for any pending document updates to be indexed before returning a result.
-  nonisolated func tests() async -> [AnnotatedTestItem] {
+  nonisolated func tests() async -> [TestItem] {
     let readTask = indexingQueue.async(metadata: .read) {
       return await self.indexedTests.values.flatMap { $0.tests }
     }