From 6d96f8be8e59188cf03371389b71377c9617fbd0 Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Tue, 17 Jun 2025 01:57:30 +0300 Subject: [PATCH] Use a proper snapshot version when resolving for utf16 points (#32815) Release Notes: - Fixed a panic when merging pull and (newer) push diagnostics Co-authored-by: Conrad Irwin --- crates/project/src/lsp_store.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs index d583257859..46c8185814 100644 --- a/crates/project/src/lsp_store.rs +++ b/crates/project/src/lsp_store.rs @@ -6680,11 +6680,7 @@ impl LspStore { }; if let Some(buffer_handle) = self.buffer_store.read(cx).get_by_path(&project_path, cx) { - let snapshot = self - .as_local_mut() - .unwrap() - .buffer_snapshot_for_lsp_version(&buffer_handle, server_id, version, cx)?; - + let snapshot = buffer_handle.read(cx).snapshot(); let buffer = buffer_handle.read(cx); let reused_diagnostics = buffer .get_diagnostics(server_id)