Make DiagnoseTests build in Swift 6 mode

Author: ahoppen

.gitignore

@@ -3,6 +3,7 @@ default.profraw
 Package.resolved
 /.build
 /.index-build
+/.linux-build
 /Packages
 /*.xcodeproj
 /*.sublime-project

Sources/SKTestSupport/DefaultSDKPath.swift

@@ -0,0 +1,37 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2024 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import class TSCBasic.Process
+
+#if !os(macOS)
+import Foundation
+#endif
+
+private func xcrunMacOSSDKPath() -> String? {
+  guard var path = try? Process.checkNonZeroExit(arguments: ["/usr/bin/xcrun", "--show-sdk-path", "--sdk", "macosx"])
+  else {
+    return nil
+  }
+  if path.last == "\n" {
+    path = String(path.dropLast())
+  }
+  return path
+}
+
+/// The default sdk path to use.
+public let defaultSDKPath: String? = {
+  #if os(macOS)
+  return xcrunMacOSSDKPath()
+  #else
+  return ProcessInfo.processInfo.environment["SDKROOT"]
+  #endif
+}()

Sources/SKTestSupport/IndexedSingleSwiftFileTestProject.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import ISDBTibs
 import LanguageServerProtocol
 @_spi(Testing) import SKCore
 import SourceKitLSP
@@ -66,7 +65,7 @@ public struct IndexedSingleSwiftFileTestProject {
       compilerArguments.append("-index-ignore-system-modules")
     }
 
-    if let sdk = TibsBuilder.defaultSDKPath {
+    if let sdk = defaultSDKPath {
       compilerArguments += ["-sdk", sdk]
 
       // The following are needed so we can import XCTest

Sources/SKTestSupport/Utils.swift

@@ -70,7 +70,7 @@ public func testScratchDir(testName: String = #function) throws -> URL {
 /// The temporary directory will be deleted at the end of `directory` unless the
 /// `SOURCEKITLSP_KEEP_TEST_SCRATCH_DIR` environment variable is set.
 public func withTestScratchDir<T>(
-  _ body: (AbsolutePath) async throws -> T,
+  _ body: @Sendable (AbsolutePath) async throws -> T,
   testName: String = #function
 ) async throws -> T {
   let scratchDirectory = try testScratchDir(testName: testName)

Tests/DiagnoseTests/DiagnoseTests.swift

@@ -19,32 +19,31 @@ import SKTestSupport
 import SourceKitD
 import XCTest
 
-import class ISDBTibs.TibsBuilder
 import struct TSCBasic.AbsolutePath
 
-final class DiagnoseTests: XCTestCase {
-  /// If a default SDK is present on the test machine, return the `-sdk` argument that can be placed in the request
-  /// YAML. Otherwise, return an empty string.
-  private var sdkArg: String {
-    if let sdk = TibsBuilder.defaultSDKPath {
-      return """
-        "-sdk", "\(sdk)",
-        """
-    } else {
-      return ""
-    }
+/// If a default SDK is present on the test machine, return the `-sdk` argument that can be placed in the request
+/// YAML. Otherwise, return an empty string.
+private let sdkArg: String = {
+  if let sdk = defaultSDKPath {
+    return """
+      "-sdk", "\(sdk)",
+      """
+  } else {
+    return ""
   }
-
-  /// If a default SDK is present on the test machine, return the `-sdk` argument that can be placed in the request
-  /// YAML. Otherwise, return an empty string.
-  private var sdkArgs: [String] {
-    if let sdk = TibsBuilder.defaultSDKPath {
-      return ["-sdk", "\(sdk)"]
-    } else {
-      return []
-    }
+}()
+
+/// If a default SDK is present on the test machine, return the `-sdk` argument that can be placed in the request
+/// YAML. Otherwise, return an empty string.
+private let sdkArgs: [String] = {
+  if let sdk = defaultSDKPath {
+    return ["-sdk", "\(sdk)"]
+  } else {
+    return []
   }
+}()
 
+final class DiagnoseTests: XCTestCase {
   func testRemoveCodeItemsAndMembers() async throws {
     // We consider the test case reproducing if cursor info returns the two ambiguous results including their doc
     // comments.
@@ -232,25 +231,25 @@ final class DiagnoseTests: XCTestCase {
 private func assertReduceSourceKitD(
   _ markedFileContents: String,
   request: String,
-  reproducerPredicate: @escaping (String) -> Bool,
+  reproducerPredicate: @Sendable @escaping (String) -> Bool,
   expectedReducedFileContents: String,
-  file: StaticString = #file,
+  file: StaticString = #filePath,
   line: UInt = #line
 ) async throws {
   let (markers, fileContents) = extractMarkers(markedFileContents)
 
   let toolchain = try await unwrap(ToolchainRegistry.forTesting.default)
   logger.debug("Using \(toolchain.path?.pathString ?? "<nil>") to reduce source file")
-  let requestExecutor = try InProcessSourceKitRequestExecutor(
-    toolchain: toolchain,
-    reproducerPredicate: NSPredicate(block: { (requestResponse, _) -> Bool in
-      reproducerPredicate(requestResponse as! String)
-    })
-  )
 
   let markerOffset = try XCTUnwrap(markers["1️⃣"], "Failed to find position marker 1️⃣ in file contents")
 
   try await withTestScratchDir { scratchDir in
+    let requestExecutor = try InProcessSourceKitRequestExecutor(
+      toolchain: toolchain,
+      reproducerPredicate: NSPredicate(block: { (requestResponse, _) -> Bool in
+        reproducerPredicate(requestResponse as! String)
+      })
+    )
     let testFilePath = scratchDir.appending(component: "test.swift").pathString
     try fileContents.write(toFile: testFilePath, atomically: false, encoding: .utf8)