fix(lsp): avoid calling client while holding lock #18197
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
bartlomieju
approved these changes
Mar 15, 2023
Comment on lines
+46
to
+49
| /// Gets additional methods that should only be called outside | ||
| /// the LSP's lock to prevent deadlocking scenarios. | ||
| pub fn when_outside_lsp_lock(&self) -> OutsideLockClient { | ||
| OutsideLockClient(self.0.clone()) |
| self.0.send_registry_state_notification(params).await; | ||
| // do on a task in case the caller currently is in the lsp lock | ||
| let client = self.0.clone(); | ||
| tokio::task::spawn(async move { |
There was a problem hiding this comment.
Does it need to be spawn instead of spawn_local? I.e does it need to run on a separate thread?
There was a problem hiding this comment.
Doesn't work:
thread '<unnamed>' panicked at '`spawn_local` called from outside of a `task::LocalSet`', cli\lsp\client.rs:66:5
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
[Info - 9:57:12 AM] Connection to server got closed. Server will restart.
There was a problem hiding this comment.
Interesting! I guess this all circles back to issue in 18079
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.
Extracted and improved out of #17979
I think this gets all the remaining parts of the code that call into the client awaiting while holding onto the lsp lock.