Skip to content

Don't cancel cursor info and related identifiers requests on subsequent requests #972

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 1 commit into from
Nov 27, 2023
Merged

Don't cancel cursor info and related identifiers requests on subsequent requests #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions Sources/SourceKitD/sourcekitd_uids.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public struct sourcekitd_keys {
public let associated_usrs: sourcekitd_uid_t
public let bodylength: sourcekitd_uid_t
public let bodyoffset: sourcekitd_uid_t
public let cancelOnSubsequentRequest: sourcekitd_uid_t
public let categories: sourcekitd_uid_t
public let categorizededits: sourcekitd_uid_t
public let column: sourcekitd_uid_t
Expand Down Expand Up @@ -97,6 +98,7 @@ public struct sourcekitd_keys {
associated_usrs = api.uid_get_from_cstr("key.associated_usrs")!
bodylength = api.uid_get_from_cstr("key.bodylength")!
bodyoffset = api.uid_get_from_cstr("key.bodyoffset")!
cancelOnSubsequentRequest = api.uid_get_from_cstr("key.cancel_on_subsequent_request")!
categories = api.uid_get_from_cstr("key.categories")!
categorizededits = api.uid_get_from_cstr("key.categorizededits")!
column = api.uid_get_from_cstr("key.column")!
Expand Down
1 change: 1 addition & 0 deletions Sources/SourceKitLSP/Swift/CursorInfo.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ extension SwiftLanguageServer {

let skreq = SKDRequestDictionary(sourcekitd: sourcekitd)
skreq[keys.request] = requests.cursorinfo
skreq[keys.cancelOnSubsequentRequest] = 0
skreq[keys.offset] = offsetRange.lowerBound
if offsetRange.upperBound != offsetRange.lowerBound {
skreq[keys.length] = offsetRange.count
Expand Down
1 change: 1 addition & 0 deletions Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,7 @@ extension SwiftLanguageServer {

let skreq = SKDRequestDictionary(sourcekitd: self.sourcekitd)
skreq[keys.request] = self.requests.relatedidents
skreq[keys.cancelOnSubsequentRequest] = 0
skreq[keys.offset] = offset
skreq[keys.sourcefile] = snapshot.uri.pseudoPath

Expand Down