Merge pull request #927 from ahoppen/ahoppen/mini-improvements

Minor improvements to SwiftLanguageServer.swift

Author: ahoppen

Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift

@@ -367,6 +367,12 @@ extension SwiftLanguageServer {
   /// If the client doesn't support pull diagnostics, compute diagnostics for the latest version of the given document
   /// and send a `PublishDiagnosticsNotification` to the client for it.
   private func publishDiagnosticsIfNeeded(for document: DocumentURI) {
+    withLoggingScope("publish-diagnostics") {
+      publishDiagnosticsIfNeededImpl(for: document)
+    }
+  }
+
+  private func publishDiagnosticsIfNeededImpl(for document: DocumentURI) {
     guard enablePublishDiagnostics else {
       return
     }
@@ -383,24 +389,31 @@ extension SwiftLanguageServer {
         // Sleep for a little bit until triggering the diagnostic generation. This effectively de-bounces diagnostic
         // generation since any later edit will cancel the previous in-flight task, which will thus never go on to send
         // the `DocumentDiagnosticsRequest`.
-        try await Task.sleep(nanoseconds: UInt64(sourceKitServer.options.swiftPublishDiagnosticsDebounceDuration * 1_000_000_000))
+        try await Task.sleep(
+          nanoseconds: UInt64(sourceKitServer.options.swiftPublishDiagnosticsDebounceDuration * 1_000_000_000)
+        )
       } catch {
         return
       }
       do {
-        let diagnosticReport = try await self.fullDocumentDiagnosticReport(DocumentDiagnosticsRequest(textDocument: TextDocumentIdentifier(document)))
+        let diagnosticReport = try await self.fullDocumentDiagnosticReport(
+          DocumentDiagnosticsRequest(textDocument: TextDocumentIdentifier(document))
+        )
 
         await sourceKitServer.sendNotificationToClient(
           PublishDiagnosticsNotification(
             uri: document,
             diagnostics: diagnosticReport.items
           )
         )
+      } catch is CancellationError {
       } catch {
-        logger.fault("""
+        logger.fault(
+          """
           Failed to get diagnostics
           \(error.forLogging)
-          """)
+          """
+        )
       }
     }
   }
@@ -1133,7 +1146,9 @@ extension SwiftLanguageServer {
     return try await .full(fullDocumentDiagnosticReport(req))
   }
 
-  private func fullDocumentDiagnosticReport(_ req: DocumentDiagnosticsRequest) async throws -> RelatedFullDocumentDiagnosticReport {
+  private func fullDocumentDiagnosticReport(
+    _ req: DocumentDiagnosticsRequest
+  ) async throws -> RelatedFullDocumentDiagnosticReport {
     guard let snapshot = documentManager.latestSnapshot(req.textDocument.uri) else {
       throw ResponseError.unknown("failed to find snapshot for url \(req.textDocument.uri.forLogging)")
     }