Skip to content

Close temporarily opened documents #566

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
Jun 8, 2022
Merged

Close temporarily opened documents #566

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
33 changes: 30 additions & 3 deletions Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,14 +659,23 @@ extension SwiftLanguageServer {
return completion(.failure(.unknown(msg)))
}

let helperDocumentName = "DocumentSymbols:" + snapshot.document.uri.pseudoPath
let skreq = SKDRequestDictionary(sourcekitd: self.sourcekitd)
skreq[keys.request] = self.requests.editor_open
skreq[keys.name] = "DocumentSymbols:" + snapshot.document.uri.pseudoPath
skreq[keys.name] = helperDocumentName
skreq[keys.sourcetext] = snapshot.text
skreq[keys.syntactic_only] = 1

let handle = self.sourcekitd.send(skreq, self.queue) { [weak self] result in
guard let self = self else { return }

defer {
let closeHelperReq = SKDRequestDictionary(sourcekitd: self.sourcekitd)
closeHelperReq[self.keys.request] = self.requests.editor_close
closeHelperReq[self.keys.name] = helperDocumentName
_ = self.sourcekitd.send(closeHelperReq, .global(qos: .utility), reply: { _ in })
}

guard let dict = result.success else {
return completion(.failure(ResponseError(result.failure!)))
}
Expand Down Expand Up @@ -756,14 +765,23 @@ extension SwiftLanguageServer {
return
}

let helperDocumentName = "DocumentColor:" + snapshot.document.uri.pseudoPath
let skreq = SKDRequestDictionary(sourcekitd: self.sourcekitd)
skreq[keys.request] = self.requests.editor_open
skreq[keys.name] = "DocumentColor:" + snapshot.document.uri.pseudoPath
skreq[keys.name] = helperDocumentName
skreq[keys.sourcetext] = snapshot.text
skreq[keys.syntactic_only] = 1

let handle = self.sourcekitd.send(skreq, self.queue) { [weak self] result in
guard let self = self else { return }

defer {
let closeHelperReq = SKDRequestDictionary(sourcekitd: self.sourcekitd)
closeHelperReq[keys.request] = self.requests.editor_close
closeHelperReq[keys.name] = helperDocumentName
_ = self.sourcekitd.send(closeHelperReq, .global(qos: .utility), reply: { _ in })
}

guard let dict = result.success else {
req.reply(.failure(ResponseError(result.failure!)))
return
Expand Down Expand Up @@ -962,14 +980,23 @@ extension SwiftLanguageServer {
return
}

let helperDocumentName = "FoldingRanges:" + snapshot.document.uri.pseudoPath
let skreq = SKDRequestDictionary(sourcekitd: self.sourcekitd)
skreq[keys.request] = self.requests.editor_open
skreq[keys.name] = "FoldingRanges:" + snapshot.document.uri.pseudoPath
skreq[keys.name] = helperDocumentName
skreq[keys.sourcetext] = snapshot.text
skreq[keys.syntactic_only] = 1

let handle = self.sourcekitd.send(skreq, self.queue) { [weak self] result in
guard let self = self else { return }

defer {
let closeHelperReq = SKDRequestDictionary(sourcekitd: self.sourcekitd)
closeHelperReq[keys.request] = self.requests.editor_close
closeHelperReq[keys.name] = helperDocumentName
_ = self.sourcekitd.send(closeHelperReq, .global(qos: .utility), reply: { _ in })
}

guard let dict = result.success else {
req.reply(.failure(ResponseError(result.failure!)))
return
Expand Down