Merge pull request #2237 from ahoppen/end-package-reload-signpost

ahoppen · web-flow · commit 5f1aab86b884 · 2025-08-14T19:15:04.000+02:00
Ensure that we end the `Reloading package` interval if a call in `reloadPackageAssumingOnPackageLoadingQueue` throws
diff --git a/Sources/BuildServerIntegration/SwiftPMBuildServer.swift b/Sources/BuildServerIntegration/SwiftPMBuildServer.swift
@@ -389,6 +389,7 @@ package actor SwiftPMBuildServer: BuiltInBuildServer {
     )
     await testHooks.reloadPackageDidStart?()
     defer {
+      signposter.endInterval("Reloading package", state)
       Task {
         self.connectionToSourceKitLSP.send(
           TaskFinishNotification(taskId: TaskId(id: "package-reloading"), status: .ok)
@@ -456,7 +457,6 @@ package actor SwiftPMBuildServer: BuiltInBuildServer {
     signposter.emitEvent("Finished traversing modules", id: signpostID)
 
     connectionToSourceKitLSP.send(OnBuildTargetDidChangeNotification(changes: nil))
-    signposter.endInterval("Reloading package", state)
   }
 
   package nonisolated var supportsPreparationAndOutputPaths: Bool { options.backgroundIndexingOrDefault }

Original file line number	Diff line number	Diff line change
`@@ -389,6 +389,7 @@ package actor SwiftPMBuildServer: BuiltInBuildServer {`
`389`	`389`	`)`
`390`	`390`	`await testHooks.reloadPackageDidStart?()`
`391`	`391`	`defer {`
	`392`	`+ signposter.endInterval("Reloading package", state)`
`392`	`393`	`Task {`
`393`	`394`	`self.connectionToSourceKitLSP.send(`
`394`	`395`	`TaskFinishNotification(taskId: TaskId(id: "package-reloading"), status: .ok)`
`@@ -456,7 +457,6 @@ package actor SwiftPMBuildServer: BuiltInBuildServer {`
`456`	`457`	`signposter.emitEvent("Finished traversing modules", id: signpostID)`
`457`	`458`
`458`	`459`	`connectionToSourceKitLSP.send(OnBuildTargetDidChangeNotification(changes: nil))`
`459`		`- signposter.endInterval("Reloading package", state)`
`460`	`460`	`}`
`461`	`461`
`462`	`462`	`package nonisolated var supportsPreparationAndOutputPaths: Bool { options.backgroundIndexingOrDefault }`