Merge pull request #1685 from ahoppen/only-scan-test-targets

Only scan test targets for tests

Author: ahoppen

Sources/BuildSystemIntegration/BuildSystemManager.swift

@@ -775,6 +775,12 @@ package actor BuildSystemManager: QueueBasedMessageHandler {
     return result
   }
 
+  package func buildTarget(named identifier: BuildTargetIdentifier) async -> BuildTarget? {
+    return await orLog("Getting built target with ID") {
+      try await buildTargets()[identifier]?.target
+    }
+  }
+
   package func sourceFiles(in targets: Set<BuildTargetIdentifier>) async throws -> [SourcesItem] {
     guard let connectionToBuildSystem = await connectionToBuildSystem else {
       return []

Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift

@@ -453,7 +453,10 @@ package actor SwiftPMBuildSystem: BuiltInBuildSystem {
 
   package func buildTargets(request: WorkspaceBuildTargetsRequest) async throws -> WorkspaceBuildTargetsResponse {
     var targets = self.swiftPMTargets.map { (targetId, target) in
-      var tags: [BuildTargetTag] = [.test]
+      var tags: [BuildTargetTag] = []
+      if target.isTestTarget {
+        tags.append(.test)
+      }
       if !target.isPartOfRootPackage {
         tags.append(.dependency)
       }

Sources/SourceKitLSP/TestDiscovery.swift

@@ -522,6 +522,14 @@ extension SwiftLanguageService {
     for uri: DocumentURI,
     in workspace: Workspace
   ) async throws -> [AnnotatedTestItem]? {
+    let targetIdentifiers = await workspace.buildSystemManager.targets(for: uri)
+    let isInTestTarget = await targetIdentifiers.asyncContains(where: {
+      await workspace.buildSystemManager.buildTarget(named: $0)?.tags.contains(.test) ?? true
+    })
+    if !targetIdentifiers.isEmpty && !isInTestTarget {
+      // If we know the targets for the file and the file is not part of any test target, don't scan it for tests.
+      return nil
+    }
     let snapshot = try documentManager.latestSnapshot(uri)
     let semanticSymbols = workspace.index(checkedFor: .deletedFiles)?.symbols(inFilePath: snapshot.uri.pseudoPath)
     let xctestSymbols = await SyntacticSwiftXCTestScanner.findTestSymbols(

Sources/SwiftExtensions/Sequence+AsyncMap.swift

@@ -81,4 +81,11 @@ extension Sequence {
 
     return nil
   }
+
+  /// Just like `Sequence.contains` but allows an `async` predicate function.
+  package func asyncContains(
+    @_inheritActorContext where predicate: @Sendable (Element) async throws -> Bool
+  ) async rethrows -> Bool {
+    return try await asyncFirst(predicate) != nil
+  }
 }

Tests/SourceKitLSPTests/DocumentTestDiscoveryTests.swift

@@ -1424,4 +1424,21 @@ final class DocumentTestDiscoveryTests: XCTestCase {
       ]
     )
   }
+
+  func testSwiftTestingTestsAreNotReportedInNonTestTargets() async throws {
+    let project = try await SwiftPMTestProject(
+      files: [
+        "FileA.swift": """
+          @Suite struct MyTests {
+          @Test func inStruct() {}
+        }
+        """
+      ]
+    )
+
+    let (uri, _) = try project.openDocument("FileA.swift")
+
+    let tests = try await project.testClient.send(DocumentTestsRequest(textDocument: TextDocumentIdentifier(uri)))
+    XCTAssertEqual(tests, [])
+  }
 }

Tests/SourceKitLSPTests/WorkspaceTestDiscoveryTests.swift

@@ -1063,6 +1063,21 @@ final class WorkspaceTestDiscoveryTests: XCTestCase {
       ]
     )
   }
+
+  func testSwiftTestingTestsAreNotDiscoveredInNonTestTargets() async throws {
+    let project = try await SwiftPMTestProject(
+      files: [
+        "FileA.swift": """
+          @Suite struct MyTests {
+          @Test func inStruct() {}
+        }
+        """
+      ]
+    )
+
+    let tests = try await project.testClient.send(WorkspaceTestsRequest())
+    XCTAssertEqual(tests, [])
+  }
 }
 
 extension TestItem {