Skip to content

Set cancelBuilds to 0 on close instead of open #1347

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
ahoppen merged 1 commit into from
May 25, 2024
Merged

Set cancelBuilds to 0 on close instead of open #1347

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
25 changes: 9 additions & 16 deletions Sources/SourceKitLSP/Swift/SwiftLanguageService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,13 +326,7 @@ extension SwiftLanguageService {
cancelInFlightPublishDiagnosticsTask(for: snapshot.uri)
await diagnosticReportManager.removeItemsFromCache(with: snapshot.uri)

let keys = self.keys
let path = snapshot.uri.pseudoPath

let closeReq = sourcekitd.dictionary([
keys.request: requests.editorClose,
keys.name: path,
])
let closeReq = closeDocumentSourcekitdRequest(uri: snapshot.uri)
_ = try? await self.sourcekitd.send(closeReq, fileContents: nil)

let openReq = openDocumentSourcekitdRequest(snapshot: snapshot, compileCommand: compileCmd)
Expand Down Expand Up @@ -382,6 +376,13 @@ extension SwiftLanguageService {
keys.enableDiagnostics: 0,
keys.syntacticOnly: 1,
keys.compilerArgs: compileCommand?.compilerArgs as [SKDRequestValue]?,
])
}

private func closeDocumentSourcekitdRequest(uri: DocumentURI) -> SKDRequestDictionary {
return sourcekitd.dictionary([
keys.request: requests.editorClose,
keys.name: uri.pseudoPath,
keys.cancelBuilds: 0,
])
}
Expand Down Expand Up @@ -421,17 +422,9 @@ extension SwiftLanguageService {
inFlightPublishDiagnosticsTasks[note.textDocument.uri] = nil
await diagnosticReportManager.removeItemsFromCache(with: note.textDocument.uri)

let keys = self.keys

self.documentManager.close(note)

let uri = note.textDocument.uri

let req = sourcekitd.dictionary([
keys.request: self.requests.editorClose,
keys.name: uri.pseudoPath,
])

let req = closeDocumentSourcekitdRequest(uri: note.textDocument.uri)
_ = try? await self.sourcekitd.send(req, fileContents: nil)
}

Expand Down