Skip to content

Commit 84b1416

Browse files
owenvowenv
committed
Adopt swift-tools-protocols
1 parent 16c60b5 commit 84b1416

File tree

450 files changed

+880
-22181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

450 files changed

+880
-22181
lines changed

‎Package.swift‎

Lines changed: 85 additions & 164 deletions
Large diffs are not rendered by default.

‎Sources/BuildServerIntegration/BuildServerHooks.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
package import Foundation
14-
package import LanguageServerProtocol
14+
@_spi(SourceKitLSP) package import LanguageServerProtocol
1515

1616
package struct SwiftPMTestHooks: Sendable {
1717
package var reloadPackageDidStart: (@Sendable () async -> Void)?

‎Sources/BuildServerIntegration/BuildServerManager.swift‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,19 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
package import BuildServerProtocol
13+
@_spi(SourceKitLSP) package import BuildServerProtocol
1414
import Dispatch
1515
package import Foundation
16-
package import LanguageServerProtocol
17-
package import LanguageServerProtocolExtensions
18-
import SKLogging
16+
@_spi(SourceKitLSP) package import LanguageServerProtocol
17+
@_spi(SourceKitLSP) import LanguageServerProtocolExtensions
18+
@_spi(SourceKitLSP) package import LanguageServerProtocolTransport
19+
@_spi(SourceKitLSP) import SKLogging
1920
package import SKOptions
2021
import SKUtilities
21-
package import SwiftExtensions
22+
import SwiftExtensions
2223
import TSCExtensions
2324
package import ToolchainRegistry
25+
@_spi(SourceKitLSP) package import ToolsProtocolsSwiftExtensions
2426

2527
import struct TSCBasic.RelativePath
2628

@@ -1085,7 +1087,7 @@ package actor BuildServerManager: QueueBasedMessageHandler {
10851087
) async -> FileBuildSettings? {
10861088
let buildSettingsFromBuildServer = await orLog("Getting build settings") {
10871089
if fallbackAfterTimeout {
1088-
try await withTimeout(options.buildSettingsTimeoutOrDefault) {
1090+
try await SwiftExtensions.withTimeout(options.buildSettingsTimeoutOrDefault) {
10891091
return try await self.buildSettingsFromBuildServer(for: document, in: target, language: language)
10901092
} resultReceivedAfterTimeout: { _ in
10911093
await self.filesBuildSettingsChangedDebouncer.scheduleCall([document])
@@ -1390,7 +1392,7 @@ package actor BuildServerManager: QueueBasedMessageHandler {
13901392
private func buildTargets() async throws -> [BuildTargetIdentifier: BuildTargetInfo] {
13911393
let request = WorkspaceBuildTargetsRequest()
13921394
let result = try await cachedBuildTargets.get(request, isolation: self) { request in
1393-
let result = try await withTimeout(self.options.buildServerWorkspaceRequestsTimeoutOrDefault) {
1395+
let result = try await SwiftExtensions.withTimeout(self.options.buildServerWorkspaceRequestsTimeoutOrDefault) {
13941396
guard let buildServerAdapter = try await self.buildServerAdapterAfterInitialized else {
13951397
return [:]
13961398
}
@@ -1458,7 +1460,7 @@ package actor BuildServerManager: QueueBasedMessageHandler {
14581460
}
14591461

14601462
let response = try await cachedTargetSources.get(request, isolation: self) { request in
1461-
try await withTimeout(self.options.buildServerWorkspaceRequestsTimeoutOrDefault) {
1463+
try await SwiftExtensions.withTimeout(self.options.buildServerWorkspaceRequestsTimeoutOrDefault) {
14621464
guard let buildServerAdapter = try await self.buildServerAdapterAfterInitialized else {
14631465
return BuildTargetSourcesResponse(items: [])
14641466
}

‎Sources/BuildServerIntegration/BuildServerManagerDelegate.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
package import BuildServerProtocol
14-
package import LanguageServerProtocol
13+
@_spi(SourceKitLSP) package import BuildServerProtocol
14+
@_spi(SourceKitLSP) package import LanguageServerProtocol
1515

1616
/// Handles build server events, such as file build settings changes.
1717
package protocol BuildServerManagerDelegate: AnyObject, Sendable {

‎Sources/BuildServerIntegration/BuildServerMessageDependencyTracker.swift‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
import BuildServerProtocol
14-
package import LanguageServerProtocol
15-
import LanguageServerProtocolExtensions
16-
import SKLogging
13+
@_spi(SourceKitLSP) import BuildServerProtocol
14+
@_spi(SourceKitLSP) package import LanguageServerProtocol
15+
@_spi(SourceKitLSP) import LanguageServerProtocolExtensions
16+
@_spi(SourceKitLSP) import LanguageServerProtocolTransport
17+
@_spi(SourceKitLSP) import SKLogging
1718
import SwiftExtensions
1819

1920
/// A lightweight way of describing tasks that are created from handling BSP

‎Sources/BuildServerIntegration/BuildSettingsLogger.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
package import LanguageServerProtocol
14-
package import SKLogging
13+
@_spi(SourceKitLSP) package import LanguageServerProtocol
14+
@_spi(SourceKitLSP) package import SKLogging
1515
import SwiftExtensions
1616

1717
// MARK: - Build settings logger

‎Sources/BuildServerIntegration/BuildTargetIdentifierExtensions.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
package import BuildServerProtocol
13+
@_spi(SourceKitLSP) package import BuildServerProtocol
1414
import Foundation
15-
import LanguageServerProtocol
16-
import SKLogging
15+
@_spi(SourceKitLSP) import LanguageServerProtocol
16+
@_spi(SourceKitLSP) public import SKLogging
1717

1818
extension BuildTargetIdentifier {
1919
package static let dummy: BuildTargetIdentifier = BuildTargetIdentifier(uri: try! URI(string: "dummy://dummy"))
@@ -146,7 +146,7 @@ extension BuildTargetIdentifier {
146146
}
147147
}
148148

149-
extension BuildTargetIdentifier: CustomLogStringConvertible {
149+
@_spi(SourceKitLSP) extension BuildTargetIdentifier: @retroactive CustomLogStringConvertible {
150150
package var description: String {
151151
return uri.stringValue
152152
}

‎Sources/BuildServerIntegration/BuiltInBuildServer.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
package import BuildServerProtocol
13+
@_spi(SourceKitLSP) package import BuildServerProtocol
1414
package import Foundation
15-
package import LanguageServerProtocol
16-
import SKLogging
15+
@_spi(SourceKitLSP) package import LanguageServerProtocol
16+
@_spi(SourceKitLSP) import SKLogging
1717
import SKOptions
1818
import ToolchainRegistry
1919

‎Sources/BuildServerIntegration/BuiltInBuildServerAdapter.swift‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
import BuildServerProtocol
13+
@_spi(SourceKitLSP) import BuildServerProtocol
1414
package import Foundation
15-
package import LanguageServerProtocol
16-
import LanguageServerProtocolExtensions
17-
import SKLogging
15+
@_spi(SourceKitLSP) package import LanguageServerProtocol
16+
@_spi(SourceKitLSP) import LanguageServerProtocolExtensions
17+
@_spi(SourceKitLSP) import LanguageServerProtocolTransport
18+
@_spi(SourceKitLSP) import SKLogging
1819
import SKOptions
1920
import SwiftExtensions
2021
import ToolchainRegistry
22+
import ToolsProtocolsSwiftExtensions
2123

2224
/// The details necessary to create a `BuildServerAdapter`.
2325
package struct BuildServerSpec {

‎Sources/BuildServerIntegration/CMakeLists.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@ add_library(BuildServerIntegration STATIC
2525
set_target_properties(BuildServerIntegration PROPERTIES
2626
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
2727
target_link_libraries(BuildServerIntegration PUBLIC
28-
BuildServerProtocol
29-
LanguageServerProtocol
30-
LanguageServerProtocolJSONRPC
31-
SKLogging
28+
SwiftToolsProtocols::BuildServerProtocol
29+
SwiftToolsProtocols::LanguageServerProtocol
30+
SwiftToolsProtocols::LanguageServerProtocolTransport
31+
SwiftToolsProtocols::SKLogging
3232
SKOptions
3333
LanguageServerProtocolExtensions
3434
SourceKitD
3535
SwiftExtensions
36+
SwiftToolsProtocols::ToolsProtocolsSwiftExtensions
3637
ToolchainRegistry
3738
PackageModel
3839
TSCBasic

0 commit comments

Comments
 (0)