File tree Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -203,7 +203,7 @@ package actor SwiftPMBuildSystem: BuiltInBuildSystem {
203
203
throw Error . cannotDetermineHostToolchain
204
204
}
205
205
206
- var absProjectRoot = try AbsolutePath ( validating: projectRoot. filePath)
206
+ let absProjectRoot = try AbsolutePath ( validating: projectRoot. filePath)
207
207
let hostSDK = try SwiftSDK . hostSwiftSDK ( AbsolutePath ( validating: destinationToolchainBinDir. filePath) )
208
208
let hostSwiftPMToolchain = try UserToolchain ( swiftSDK: hostSDK)
209
209
@@ -237,10 +237,10 @@ package actor SwiftPMBuildSystem: BuiltInBuildSystem {
237
237
fileSystem: localFileSystem
238
238
)
239
239
240
- if options. backgroundIndexingOrDefault {
241
- location. scratchDirectory = absProjectRoot. appending ( components: " .build " , " index-build " )
242
- } else if let scratchDirectory = options. swiftPMOrDefault. scratchPath {
240
+ if let scratchDirectory = options. swiftPMOrDefault. scratchPath {
243
241
location. scratchDirectory = try AbsolutePath ( validating: scratchDirectory, relativeTo: absProjectRoot)
242
+ } else if options. backgroundIndexingOrDefault {
243
+ location. scratchDirectory = absProjectRoot. appending ( components: " .build " , " index-build " )
244
244
}
245
245
246
246
var configuration = WorkspaceConfiguration . default
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ public import Foundation
15
15
public import LanguageServerProtocol
16
16
import LanguageServerProtocolExtensions
17
17
import SKLogging
18
- package import SKOptions
18
+ public import SKOptions
19
19
package import SourceKitLSP
20
20
import SwiftExtensions
21
21
import TSCExtensions
@@ -31,13 +31,14 @@ public final class InProcessSourceKitLSPClient: Sendable {
31
31
32
32
public convenience init (
33
33
toolchainPath: URL ? ,
34
+ options: SourceKitLSPOptions = SourceKitLSPOptions ( ) ,
34
35
capabilities: ClientCapabilities = ClientCapabilities ( ) ,
35
36
workspaceFolders: [ WorkspaceFolder ] ,
36
37
messageHandler: any MessageHandler
37
38
) async throws {
38
39
try await self . init (
39
40
toolchainRegistry: ToolchainRegistry ( installPath: toolchainPath) ,
40
- options: SourceKitLSPOptions ( ) ,
41
+ options: options ,
41
42
capabilities: capabilities,
42
43
workspaceFolders: workspaceFolders,
43
44
messageHandler: messageHandler
You can’t perform that action at this time.
0 commit comments