averello/sourcekit-lsp
1
0
Fork 0
mirror of https://github.com/apple/sourcekit-lsp.git synced 2026-03-02 18:23:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use BSP to log messages from preparation in the build system

Browse Source
This commit is contained in:
Alex Hoppen
2024-09-13 16:00:56 -07:00
parent 8ac405cb19
commit d00722e33f
12 changed files with 80 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift
View File

@@ -631,13 +631,9 @@ extension SwiftPMBuildSystem: BuildSystemIntegration.BuiltInBuildSystem {
return VoidResponse()
}
private nonisolated func logMessageToIndexLog(_ taskID: IndexTaskID, _ message: String) {
private nonisolated func logMessageToIndexLog(_ taskID: TaskId, _ message: String) {
connectionToSourceKitLSP.send(
BuildServerProtocol.LogMessageNotification(
type: .info,
task: TaskId(id: taskID.rawValue),
message: message
)
BuildServerProtocol.LogMessageNotification(type: .info, task: taskID, message: message)
)
}
@@ -682,17 +678,17 @@ extension SwiftPMBuildSystem: BuildSystemIntegration.BuiltInBuildSystem {
}
let start = ContinuousClock.now
let logID = IndexTaskID.preparation(id: preparationTaskID.fetchAndIncrement())
let taskID: TaskId = TaskId(id: "preparation-\(preparationTaskID.fetchAndIncrement())")
// FIXME: (BSP Migration) log target name instead of target URI
logMessageToIndexLog(
logID,
taskID,
"""
Preparing \(target.uri.stringValue)
\(arguments.joined(separator: " "))
"""
)
let stdoutHandler = PipeAsStringHandler { self.logMessageToIndexLog(logID, $0) }
let stderrHandler = PipeAsStringHandler { self.logMessageToIndexLog(logID, $0) }
let stdoutHandler = PipeAsStringHandler { self.logMessageToIndexLog(taskID, $0) }
let stderrHandler = PipeAsStringHandler { self.logMessageToIndexLog(taskID, $0) }
let result = try await Process.run(
arguments: arguments,
@@ -703,7 +699,7 @@ extension SwiftPMBuildSystem: BuildSystemIntegration.BuiltInBuildSystem {
)
)
let exitStatus = result.exitStatus.exhaustivelySwitchable
logMessageToIndexLog(logID, "Finished with \(exitStatus.description) in \(start.duration(to: .now))")
logMessageToIndexLog(taskID, "Finished with \(exitStatus.description) in \(start.duration(to: .now))")
switch exitStatus {
case .terminated(code: 0):
break