Skip to content

Commit 2aedb85

Browse files
committed
Don't cancel cursor info and related identifiers requests on subsequent requests
SourceKit-LSP supports explicit cancellation and thus we don’t need to do the implicit cancellation of cursor info and related identifiers on subsequent requests.
1 parent 8af0bb5 commit 2aedb85

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

Sources/SourceKitD/sourcekitd_uids.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public struct sourcekitd_keys {
2020
public let associated_usrs: sourcekitd_uid_t
2121
public let bodylength: sourcekitd_uid_t
2222
public let bodyoffset: sourcekitd_uid_t
23+
public let cancelOnSubsequentRequest: sourcekitd_uid_t
2324
public let categories: sourcekitd_uid_t
2425
public let categorizededits: sourcekitd_uid_t
2526
public let column: sourcekitd_uid_t
@@ -97,6 +98,7 @@ public struct sourcekitd_keys {
9798
associated_usrs = api.uid_get_from_cstr("key.associated_usrs")!
9899
bodylength = api.uid_get_from_cstr("key.bodylength")!
99100
bodyoffset = api.uid_get_from_cstr("key.bodyoffset")!
101+
cancelOnSubsequentRequest = api.uid_get_from_cstr("key.cancel_on_subsequent_request")!
100102
categories = api.uid_get_from_cstr("key.categories")!
101103
categorizededits = api.uid_get_from_cstr("key.categorizededits")!
102104
column = api.uid_get_from_cstr("key.column")!

Sources/SourceKitLSP/Swift/CursorInfo.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ extension SwiftLanguageServer {
9494

9595
let skreq = SKDRequestDictionary(sourcekitd: sourcekitd)
9696
skreq[keys.request] = requests.cursorinfo
97+
skreq[keys.cancelOnSubsequentRequest] = 0
9798
skreq[keys.offset] = offsetRange.lowerBound
9899
if offsetRange.upperBound != offsetRange.lowerBound {
99100
skreq[keys.length] = offsetRange.count

Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -631,6 +631,7 @@ extension SwiftLanguageServer {
631631

632632
let skreq = SKDRequestDictionary(sourcekitd: self.sourcekitd)
633633
skreq[keys.request] = self.requests.relatedidents
634+
skreq[keys.cancelOnSubsequentRequest] = 0
634635
skreq[keys.offset] = offset
635636
skreq[keys.sourcefile] = snapshot.uri.pseudoPath
636637

0 commit comments

Comments
 (0)