Use tokens for timeout in dynamic completions #2434
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pfitzseb
reviewed
Sep 6, 2021
| completionPromise, | ||
| cancelPromise | ||
| ]) | ||
| const items = await conn.sendRequest(requestTypeGetCompletionItems, { line, mod }) // TODO pass newToken once we support tokens in JSONRPC.jl |
There was a problem hiding this comment.
Doesn't this mean that we always wait for this to go through before returning, unless cancellation got requested before we dispatch this request?
There was a problem hiding this comment.
Ah, yes, you're right. I don't know actually what the semantics are if we were to pass the token to the sendRequest call: would this await here finish right away, irrespective of what is happening on the server? In that case we could just pass the token here, even if the server doesn't yet implement cancel notifications. Or would it send the cancel notification message to the server and then wait until the request returns?
There was a problem hiding this comment.
Yep, seems more likely...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This rewrites the timeout functionality in terms of cancel tokens, which I think is a) more in line with the general VS Code patterns and b) will allow us to cancel even more aggressively once we support cancel tokens across the JSONRPC boundary.
The code for the two functions is copied from https://github.com/microsoft/vscode/blob/be7046f09199da197a2b566f90f51f7e2653fed7/src/vs/platform/remote/common/remoteAgentConnection.ts#L89, I don't fully understand why that isn't just part of the json-rpc npm package, but whatever :)
The one thing that is not entirely clear to me is whether we should just call
returnif cancelled, or return an empty result? The old code seemed to do both things.