Skip to content
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

Jump to bottom

Run continuation to dispose of cancellation token source #60653

Merged
merged 3 commits into from
Apr 9, 2022
Merged

Run continuation to dispose of cancellation token source #60653

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee7d01a
Run continuation to dispose of cancellation token source
dibarbet Apr 8, 2022
58eb102
Remove cancellation token and execute synchronously
dibarbet Apr 8, 2022
521f4c3
Update src/Features/LanguageServer/Protocol/Handler/RequestExecutionQ…
dibarbet Apr 8, 2022
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
5 changes: 5 additions & 0 deletions src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,11 @@ public void Shutdown()
_requestTelemetryLogger,
combinedCancellationToken);

// Run a continuation to ensure the cts is disposed of.
// We pass CancellationToken.None as we always want to dispose of the source
// even when the request is cancelled or the queue is shutting down.
_ = resultTask.ContinueWith(_ => combinedTokenSource.Dispose(), CancellationToken.None, TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);

var didEnqueue = _queue.TryEnqueue((item, combinedCancellationToken));

// If the queue has been shut down the enqueue will fail, so we just fault the task immediately.
Expand Down