Merge pull request #2019 from ahoppen/sourcekitoptions-improvements

Small improvements to `workspace/_sourceKitOptions` request

Author: ahoppen

Sources/LanguageServerProtocol/Requests/SourceKitOptionsRequest.swift

@@ -19,7 +19,7 @@
 /// **(LSP Extension)**.
 public struct SourceKitOptionsRequest: RequestType, Hashable {
   public static let method: String = "workspace/_sourceKitOptions"
-  public typealias Response = SourceKitOptionsResponse?
+  public typealias Response = SourceKitOptionsResponse
 
   /// The document to get options for
   public var textDocument: TextDocumentIdentifier

Sources/SourceKitLSP/MessageHandlingDependencyTracker.swift

@@ -225,7 +225,7 @@ package enum MessageHandlingDependencyTracker: QueueBasedMessageHandlerDependenc
     case is ShutdownRequest:
       self = .globalConfigurationChange
     case is SourceKitOptionsRequest:
-      self = .workspaceRequest
+      self = .freestanding
     case is TriggerReindexRequest:
       self = .globalConfigurationChange
     case is TypeHierarchySubtypesRequest:

Tests/BuildSystemIntegrationTests/BuildServerBuildSystemTests.swift

@@ -421,7 +421,7 @@ final class BuildServerBuildSystemTests: XCTestCase {
         allowFallbackSettings: false
       )
     )
-    XCTAssertEqual(options?.data, LSPAny.dictionary(["custom": .string("value")]))
+    XCTAssertEqual(options.data, LSPAny.dictionary(["custom": .string("value")]))
   }
 
   func testBuildSettingsForFilePartOfMultipleTargets() async throws {