refactor(lsp): remove RwLock on Config
#13485
Conversation
| ) -> AsyncReturn<Result<Vec<serde_json::Value>, AnyError>>; | ||
| uris: Vec<lsp::Url>, | ||
| ) -> AsyncReturn<Result<Vec<Result<SpecifierSettings, AnyError>>, AnyError>>; | ||
| fn workspace_configuration(&self) -> AsyncReturn<Result<Value, AnyError>>; |
There was a problem hiding this comment.
Instead of having a low level configuration method on the Client, I've split it up into two separate higher level functions. This simplifies the caller code and the REPL implementation of this trait.
| @@ -236,149 +242,62 @@ pub struct Settings { | |||
| #[derive(Debug)] | |||
| pub struct Config { | |||
| pub client_capabilities: ClientCapabilities, | |||
| settings: Arc<RwLock<Settings>>, | |||
| tx: mpsc::Sender<ConfigRequest>, | |||
| settings: Settings, | |||
There was a problem hiding this comment.
The RwLock on this is removed along with the separate thread to call the client (it's now just fired off in a task and returns to use the same LanguageServer mutex)
There was a problem hiding this comment.
Ah, yeah, ok... That whole tx/sender bit was to work around deadlocking issues I remember now, so removing it all together is a big 👍 .
| scope_uri: None, | ||
| section: Some(SETTINGS_SECTION.to_string()), | ||
| }]) | ||
| .await; |
There was a problem hiding this comment.
Here is the call that could cause a deadlock depending on how the client is implemented. Now this always happens outside the LanguageServer mutex.
| @@ -236,149 +242,62 @@ pub struct Settings { | |||
| #[derive(Debug)] | |||
| pub struct Config { | |||
| pub client_capabilities: ClientCapabilities, | |||
| settings: Arc<RwLock<Settings>>, | |||
| tx: mpsc::Sender<ConfigRequest>, | |||
| settings: Settings, | |||
There was a problem hiding this comment.
Ah, yeah, ok... That whole tx/sender bit was to work around deadlocking issues I remember now, so removing it all together is a big 👍 .
Configso the config state is behind the same lsp mutex as mostly everything elseMaybe fixes #13477.