Fix build warnings

Author: ahoppen

Sources/SourceKitLSP/Swift/MacroExpansion.swift

@@ -180,12 +180,6 @@ extension SwiftLanguageService {
   }
 
   func expandMacro(macroExpansionURLData: MacroExpansionReferenceDocumentURLData) async throws -> String {
-    guard let sourceKitLSPServer = self.sourceKitLSPServer else {
-      // `SourceKitLSPServer` has been destructed. We are tearing down the
-      // language server. Nothing left to do.
-      throw ResponseError.unknown("Connection to the editor closed")
-    }
-
     let expandMacroCommand = ExpandMacroCommand(
       positionRange: macroExpansionURLData.selectionRange,
       textDocument: TextDocumentIdentifier(macroExpansionURLData.primaryFile)

Sources/SourceKitLSP/Swift/MacroExpansionReferenceDocumentURLData.swift

@@ -59,12 +59,12 @@ package struct MacroExpansionReferenceDocumentURLData {
   }
 
   package init(displayName: String, queryItems: [URLQueryItem]) throws {
-    guard let primaryFilePath = queryItems.last { $0.name == Parameters.primaryFilePath }?.value,
-      let fromLine = Int(queryItems.last { $0.name == Parameters.fromLine }?.value ?? ""),
-      let fromColumn = Int(queryItems.last { $0.name == Parameters.fromColumn }?.value ?? ""),
-      let toLine = Int(queryItems.last { $0.name == Parameters.toLine }?.value ?? ""),
-      let toColumn = Int(queryItems.last { $0.name == Parameters.toColumn }?.value ?? ""),
-      let bufferName = queryItems.last { $0.name == Parameters.bufferName }?.value
+    guard let primaryFilePath = queryItems.last(where: { $0.name == Parameters.primaryFilePath })?.value,
+      let fromLine = Int(queryItems.last(where: { $0.name == Parameters.fromLine })?.value ?? ""),
+      let fromColumn = Int(queryItems.last(where: { $0.name == Parameters.fromColumn })?.value ?? ""),
+      let toLine = Int(queryItems.last(where: { $0.name == Parameters.toLine })?.value ?? ""),
+      let toColumn = Int(queryItems.last(where: { $0.name == Parameters.toColumn })?.value ?? ""),
+      let bufferName = queryItems.last(where: { $0.name == Parameters.bufferName })?.value
     else {
       throw ReferenceDocumentURLError(description: "Invalid queryItems for macro expansion reference document url")
     }

Sources/SourceKitLSP/Swift/ReferenceDocumentURL.swift

@@ -78,7 +78,7 @@ package enum ReferenceDocumentURL {
       throw ReferenceDocumentURLError(
         description: "Bad URL for reference document: \(url)"
       )
-    default:
+    case let documentType?:
       throw ReferenceDocumentURLError(
         description: "Invalid document type in URL for reference document: \(documentType)"
       )