diff --git a/Cargo.toml b/Cargo.toml index 1843a0456d..d5af745a0d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -406,7 +406,6 @@ style = "allow" # Individual rules that have violations in the codebase: almost_complete_range = "allow" arc_with_non_send_sync = "allow" -await_holding_lock = "allow" borrowed_box = "allow" derive_ord_xor_partial_ord = "allow" eq_op = "allow" diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs index 563599c753..18f9f79654 100644 --- a/crates/project/src/project.rs +++ b/crates/project/src/project.rs @@ -5235,16 +5235,19 @@ impl Project { project_id.ok_or_else(|| anyhow!("Remote project without remote_id"))?; for completion_index in completion_indices { - let completions_guard = completions.read(); - let completion = &completions_guard[completion_index]; - if completion.documentation.is_some() { - continue; - } + let (server_id, completion) = { + let completions_guard = completions.read(); + let completion = &completions_guard[completion_index]; + if completion.documentation.is_some() { + continue; + } - did_resolve = true; - let server_id = completion.server_id; - let completion = completion.lsp_completion.clone(); - drop(completions_guard); + did_resolve = true; + let server_id = completion.server_id; + let completion = completion.lsp_completion.clone(); + + (server_id, completion) + }; Self::resolve_completion_documentation_remote( project_id, @@ -5259,15 +5262,18 @@ impl Project { } } else { for completion_index in completion_indices { - let completions_guard = completions.read(); - let completion = &completions_guard[completion_index]; - if completion.documentation.is_some() { - continue; - } + let (server_id, completion) = { + let completions_guard = completions.read(); + let completion = &completions_guard[completion_index]; + if completion.documentation.is_some() { + continue; + } - let server_id = completion.server_id; - let completion = completion.lsp_completion.clone(); - drop(completions_guard); + let server_id = completion.server_id; + let completion = completion.lsp_completion.clone(); + + (server_id, completion) + }; let server = this .read_with(&mut cx, |project, _| {