Skip to content

Commit efe4836

Browse files
authored
Merge pull request #2158 from ahoppen/no-cancel-on-subsequent-request
Pass `cancelOnSubsequentRequest: 0` to all requests that support it
2 parents 8a908f2 + a909439 commit efe4836

File tree

3 files changed

+3
-0
lines changed

3 files changed

+3
-0
lines changed

Sources/SourceKitLSP/Swift/MacroExpansion.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ actor MacroExpansionManager {
9494
let length = snapshot.utf8OffsetRange(of: range).count
9595

9696
let skreq = swiftLanguageService.sourcekitd.dictionary([
97+
keys.cancelOnSubsequentRequest: 0,
9798
// Preferred name for e.g. an extracted variable.
9899
// Empty string means sourcekitd chooses a name automatically.
99100
keys.name: "",

Sources/SourceKitLSP/Swift/RefactoringResponse.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ extension SwiftLanguageService {
117117
let utf8Column = snapshot.lineTable.utf8ColumnAt(line: line, utf16Column: utf16Column)
118118

119119
let skreq = sourcekitd.dictionary([
120+
keys.cancelOnSubsequentRequest: 0,
120121
// Preferred name for e.g. an extracted variable.
121122
// Empty string means sourcekitd chooses a name automatically.
122123
keys.name: "",

Sources/SourceKitLSP/Swift/VariableTypeInfo.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ extension SwiftLanguageService {
8686
let snapshot = try await self.latestSnapshot(for: uri)
8787

8888
let skreq = sourcekitd.dictionary([
89+
keys.cancelOnSubsequentRequest: 0,
8990
keys.sourceFile: snapshot.uri.sourcekitdSourceFile,
9091
keys.primaryFile: snapshot.uri.primaryFile?.pseudoPath,
9192
keys.compilerArgs: await self.compileCommand(for: uri, fallbackAfterTimeout: false)?.compilerArgs

0 commit comments

Comments
 (0)