fix(ls): potential deadlock causing #486

Automattic · Jan 24, 2025 · e4251ac · e4251ac
1 parent 24baa04
commit e4251ac
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/harper-ls/src/backend.rs b/harper-ls/src/backend.rs
@@ -289,11 +289,16 @@ impl Backend {
         url: &Url,
         range: Range,
     ) -> JsonResult<Vec<CodeActionOrCommand>> {
-        let (config, mut doc_states) = tokio::join!(self.config.read(), self.doc_state.lock());
+        let (config_guard, mut doc_states) =
+            tokio::join!(self.config.read(), self.doc_state.lock());
         let Some(doc_state) = doc_states.get_mut(url) else {
             return Ok(Vec::new());
         };
 
+        // Allow writes as soon as possible to avoid deadlocks
+        let config = config_guard.clone();
+        drop(config_guard);
+
         let mut lints = doc_state.linter.lint(&doc_state.document);
         lints.sort_by_key(|l| l.priority);