Make ServerProgressReport threadsafe #1130
Merged
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
TheAngryByrd
commented
Jul 8, 2023
| @@ -712,8 +713,7 @@ type AdaptiveFSharpLspServer | |||
|
|
|||
| use progressReport = new ServerProgressReport(lspClient) | |||
|
|
|||
| progressReport.Begin($"Loading {projects.Count} Projects") | |||
| |> Async.StartImmediate | |||
| progressReport.Begin($"Loading {projects.Count} Projects") (CancellationToken.None) |> ignore<Task<unit>> | |||
There was a problem hiding this comment.
callsite change to CancellableTask
| // and https://gist.github.com/brendankowitz/5949970076952746a083054559377e56 | ||
| type SemaphoreSlim with | ||
|
|
||
| member x.LockAsync(?ct: CancellationToken) = |
There was a problem hiding this comment.
Helper so callers don't have to deal with fun try/finally semantics.
| ?cancellable = cancellable, | ||
| ?message = message, | ||
| ?percentage = percentage | ||
| cancellableTask { |
There was a problem hiding this comment.
Switched to CancellableTask since Async doesn't know how to Await generic Awaitables.
TheAngryByrd
force-pushed
the
threadsafe-progress
branch
from
2e12738 to
02461c5
Compare
TheAngryByrd
force-pushed
the
threadsafe-progress
branch
from
02461c5 to
dc7f0bf
Compare
|
Noice 👍 The helpers are a wonderful thing to have. |
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.
WHAT
🤖 Generated by Copilot at 2e12738
This pull request improves the cancellation and progress reporting of long-running tasks in the LSP servers. It introduces a new computation expression for
AdaptiveFSharpLspServerand refactors the existing logic inFSharpLspClientto use async tasks and semaphores.🤖 Generated by Copilot at 2e12738
🔄🚀🛠️
WHY
It's possible for the progress report to get out of sync with reality, it will show the progress dialogue box with no way to close it because it's possible to send Begin after End. This resolves that.
HOW
🤖 Generated by Copilot at 2e12738
cancellableTaskandlockersemaphore for consistency and cancellation support (link, link, link)AwaitableDisposabletype andLockAsyncextension method forSemaphoreSlimto handle async disposables safely and conveniently (link)System.Threading.Tasks,System.Threading, andIcedTasksto useTask,CancellationToken, andcancellableTasktypes and methods (link, link)