Use a proper snapshot version when resolving for utf16 points (cherry-pick #32815) (#32826)

gcp-cherry-pick-bot[bot] , Kirill Bulatov , and Conrad Irwin created 7 months ago

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 <conrad@zed.dev>

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
Co-authored-by: Conrad Irwin <conrad@zed.dev>

Change summary

crates/project/src/lsp_store.rs | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

Detailed changes

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)