Merge pull request #1071 from ahoppen/ahoppen/reload-package-progress-stuck

Fix issue that caused the `Reloading Package` progress indicator to be stuck

Author: ahoppen

Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift

@@ -205,6 +205,11 @@ extension SwiftPMWorkspace {
   /// dependencies.
   func reloadPackage() async throws {
     await reloadPackageStatusCallback(.start)
+    defer {
+      Task {
+        await reloadPackageStatusCallback(.end)
+      }
+    }
 
     let observabilitySystem = ObservabilitySystem({ scope, diagnostic in
       logger.log(level: diagnostic.severity.asLogLevel, "SwiftPM log: \(diagnostic.description)")
@@ -260,12 +265,10 @@ extension SwiftPMWorkspace {
     )
 
     guard let delegate = self.delegate else {
-      await reloadPackageStatusCallback(.end)
       return
     }
     await delegate.fileBuildSettingsChanged(self.watchedFiles)
     await delegate.fileHandlingCapabilityChanged()
-    await reloadPackageStatusCallback(.end)
   }
 }
 

Sources/SourceKitLSP/SourceKitServer.swift

@@ -395,7 +395,7 @@ public actor SourceKitServer {
 
   private var packageLoadingWorkDoneProgress = WorkDoneProgressState(
     "SourceKitLSP.SourceKitServer.reloadPackage",
-    title: "Reloading Package"
+    title: "SourceKit-LSP: Reloading Package"
   )
 
   /// **Public for testing**