From 44a31e2e5d13b10e43b05e9eab65d297db957082 Mon Sep 17 00:00:00 2001 From: "gcp-cherry-pick-bot[bot]" <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Tue, 17 Jun 2025 02:12:25 +0300 Subject: [PATCH] Use a proper snapshot version when resolving for utf16 points (cherry-pick #32815) (#32826) Cherry-picked 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 Co-authored-by: Kirill Bulatov 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 49663f09f22a165d7fe68a58f9f458689e495aa1..ebad73086d81f15adf475558dc9f908d6b41b1c8 100644 --- a/crates/project/src/lsp_store.rs +++ b/crates/project/src/lsp_store.rs @@ -6689,11 +6689,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)