Miscellaneous small cleanups

Author: ahoppen

Sources/DocCDocumentation/BuildSystemIntegrationExtensions.swift

@@ -52,7 +52,7 @@ package extension BuildSystemManager {
   func doccCatalog(for target: BuildTargetIdentifier) async -> URL? {
     let sourceFiles =
       await orLog(
-        "Failed to retreive source files from target \(target.uri)",
+        "Failed to retrieve source files from target \(target.uri)",
         { try await self.sourceFiles(in: [target]).flatMap(\.sources) }
       ) ?? []
     let catalogURLs = sourceFiles.compactMap { sourceItem -> URL? in

Sources/DocCDocumentation/DocCCatalogIndexManager.swift

@@ -59,8 +59,8 @@ final actor DocCCatalogIndexManager {
       indexCache[catalogURL] = .success(catalogIndex)
       return catalogIndex
     } catch {
-      // Don't cache cancellation errors
-      guard !(error is CancellationError) else {
+      if error is CancellationError {
+        // Don't cache cancellation errors
         throw .cancelled
       }
       let internalError = error as? DocCIndexError ?? DocCIndexError.internalError(error)

Sources/SourceKitLSP/Documentation/DocumentationLanguageService.swift

@@ -18,7 +18,7 @@ package import SwiftSyntax
 package import ToolchainRegistry
 
 package actor DocumentationLanguageService: LanguageService, Sendable {
-  /// The ``SourceKitLSPServer`` instance that created this `SwiftLanguageService`.
+  /// The ``SourceKitLSPServer`` instance that created this `DocumentationLanguageService`.
   private(set) weak var sourceKitLSPServer: SourceKitLSPServer?
 
   var documentManager: DocumentManager {

Sources/SourceKitLSP/Swift/DiagnosticReportManager.swift

@@ -182,8 +182,7 @@ actor DiagnosticReportManager {
     for snapshotID: DocumentSnapshot.ID,
     buildSettings: SwiftCompileCommand?
   ) -> ReportTask? {
-    let key = CacheKey(snapshotID: snapshotID, buildSettings: buildSettings)
-    return reportTaskCache[key]
+    return reportTaskCache[CacheKey(snapshotID: snapshotID, buildSettings: buildSettings)]
   }
 
   /// Set the reportTask for the given document snapshot and buildSettings.