Merge pull request #1590 from ahoppen/build-without-warnings

Make SourceKit-LSP build without warnings

Author: ahoppen

Sources/Diagnose/CMakeLists.txt

@@ -1,5 +1,4 @@
 add_library(Diagnose STATIC
-  CommandConfiguration+Sendable.swift
   CommandLineArgumentsReducer.swift
   DebugCommand.swift
   DiagnoseCommand.swift

Sources/Diagnose/CommandConfiguration+Sendable.swift

@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SKTestSupport
 import XCTest
 
 /// Runs the body repeatedly once per second until it returns `true`, giving up after `timeout`.

Sources/SKTestSupport/RepeatUntilExpectedResult.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import Dispatch
-import SKTestSupport
 import XCTest
 
 /// Wrapper around `DispatchSemaphore` so that Swift Concurrency doesn't complain about the usage of semaphores in the

Sources/SKTestSupport/WrappedSemaphore.swift

@@ -85,7 +85,7 @@ package actor DynamicallyLoadedSourceKitD: SourceKitD {
     self.api.shutdown()
     // FIXME: is it safe to dlclose() sourcekitd? If so, do that here. For now, let the handle leak.
     Task.detached(priority: .background) { [dylib] in
-      await dylib.leak()
+      dylib.leak()
     }
   }
 

Sources/SourceKitD/DynamicallyLoadedSourceKitD.swift

@@ -15,11 +15,10 @@ import Dispatch
 import Foundation
 import SwiftExtensions
 
-#if compiler(>=6)
-extension sourcekitd_api_request_handle_t: @retroactive @unchecked Sendable {}
-#else
-extension sourcekitd_api_request_handle_t: @unchecked Sendable {}
-#endif
+fileprivate struct SourceKitDRequestHandle: Sendable {
+  /// `nonisolated(unsafe)` is fine because we just use the handle as an opaque value.
+  nonisolated(unsafe) let handle: sourcekitd_api_request_handle_t
+}
 
 /// Access to sourcekitd API, taking care of initialization, shutdown, and notification handler
 /// multiplexing.
@@ -107,16 +106,19 @@ extension SourceKitD {
     log(request: request)
 
     let sourcekitdResponse = try await withTimeout(timeout) {
-      return try await withCancellableCheckedThrowingContinuation { continuation in
+      return try await withCancellableCheckedThrowingContinuation { (continuation) -> SourceKitDRequestHandle? in
         var handle: sourcekitd_api_request_handle_t? = nil
         self.api.send_request(request.dict, &handle) { response in
           continuation.resume(returning: SKDResponse(response!, sourcekitd: self))
         }
-        return handle
-      } cancel: { handle in
+        if let handle {
+          return SourceKitDRequestHandle(handle: handle)
+        }
+        return nil
+      } cancel: { (handle: SourceKitDRequestHandle?) in
         if let handle {
           self.logRequestCancellation(request: request)
-          self.api.cancel_request(handle)
+          self.api.cancel_request(handle.handle)
         }
       }
     }

Sources/SourceKitD/SourceKitD.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@preconcurrency import IndexStoreDB
+import IndexStoreDB
 import LanguageServerProtocol
 import SKLogging
 import SKSupport

Sources/SourceKitLSP/Rename.swift

@@ -35,7 +35,7 @@ struct PackageManifestEdits: SyntaxCodeActionProvider {
   ) -> [CodeAction] {
     do {
       var actions: [CodeAction] = []
-      let variants: [(TargetDescription.TargetType, String)] = [
+      let variants: [(TargetDescription.TargetKind, String)] = [
         (.regular, "library"),
         (.executable, "executable"),
         (.macro, "macro"),

Sources/SourceKitLSP/Swift/CodeActions/PackageManifestEdits.swift

@@ -762,7 +762,7 @@ final class DocumentSymbolTests: XCTestCase {
 fileprivate func assertDocumentSymbols(
   _ markedText: String,
   _ expectedDocumentSymbols: (DocumentPositions) -> [DocumentSymbol],
-  file: StaticString = #file,
+  file: StaticString = #filePath,
   line: UInt = #line
 ) async throws {
   let testClient = try await TestSourceKitLSPClient()

Tests/SourceKitLSPTests/DocumentSymbolTests.swift

@@ -44,7 +44,7 @@ func assertFoldingRanges(
   expectedRanges: [FoldingRangeSpec],
   rangeLimit: Int? = nil,
   lineFoldingOnly: Bool = false,
-  file: StaticString = #file,
+  file: StaticString = #filePath,
   line: UInt = #line
 ) async throws {
   let capabilities = ClientCapabilities(

Tests/SourceKitLSPTests/FoldingRangeTests.swift

@@ -176,7 +176,7 @@ final class HoverTests: XCTestCase {
 private func assertHover(
   _ markedSource: String,
   expectedContent: String,
-  file: StaticString = #file,
+  file: StaticString = #filePath,
   line: UInt = #line
 ) async throws {
   let testClient = try await TestSourceKitLSPClient()

Tests/SourceKitLSPTests/HoverTests.swift

@@ -39,7 +39,7 @@ func assertSingleFileRename(
   expectedPrepareRenamePlaceholder: String,
   expected: String,
   testName: String = #function,
-  file: StaticString = #file,
+  file: StaticString = #filePath,
   line: UInt = #line
 ) async throws {
   try await SkipUnless.sourcekitdSupportsRename()
@@ -99,7 +99,7 @@ func assertRenamedSourceMatches(
   in ws: MultiFileTestProject,
   message: String,
   testName: String = #function,
-  file: StaticString = #file,
+  file: StaticString = #filePath,
   line: UInt = #line
 ) throws {
   for (expectedFileLocation, expectedRenamed) in expected {
@@ -138,7 +138,7 @@ func assertMultiFileRename(
   manifest: String = SwiftPMTestProject.defaultPackageManifest,
   preRenameActions: (SwiftPMTestProject) throws -> Void = { _ in },
   testName: String = #function,
-  file: StaticString = #file,
+  file: StaticString = #filePath,
   line: UInt = #line
 ) async throws {
   try await SkipUnless.sourcekitdSupportsRename()

Tests/SourceKitLSPTests/RenameAssertions.swift

@@ -225,7 +225,7 @@ fileprivate extension TypeHierarchyItem {
 fileprivate func assertEqualIgnoringData(
   _ actual: [TypeHierarchyItem]?,
   _ expected: [TypeHierarchyItem],
-  file: StaticString = #file,
+  file: StaticString = #filePath,
   line: UInt = #line
 ) {
   guard let actual else {