Skip to content

Small improvements to workspace/_sourceKitOptions request #2019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 28, 2025
Merged

Small improvements to workspace/_sourceKitOptions request #2019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1122526
Make response of `workspace/_sourceKitOptions` request non-optional
ahoppen Feb 28, 2025
37aaa92
Mark `workspace/_sourceKitOptions` as freestanding
ahoppen Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/LanguageServerProtocol/Requests/SourceKitOptionsRequest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Sources/SourceKitLSP/MessageHandlingDependencyTracker.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,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:
Expand Down
2 changes: 1 addition & 1 deletion Tests/BuildSystemIntegrationTests/BuildServerBuildSystemTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down