From 2b471a58c9a20348d04fd2b38a888c240ebcf31d Mon Sep 17 00:00:00 2001
From: "zed-zippy[bot]" <234243425+zed-zippy[bot]@users.noreply.github.com>
Date: Wed, 25 Feb 2026 06:02:59 +0000
Subject: [PATCH] Fix panic in copilot (#50056) (cherry-pick to preview)
 (#50058)

Cherry-pick of #50056 to preview

----
Fixes ZED-599

register_buffer() only sometimes registers the buffer

Release Notes:

- Fixed a panic in Copilot completions

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 crates/copilot/src/copilot.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs
index a1bbc26b9c44d0f68e120a10bf11d0f3cae19d73..179e217d207554bcf226ce905aa9226c1c334b72 100644
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -1035,10 +1035,9 @@ impl Copilot {
         };
         let buffer_entity = buffer.clone();
         let lsp = server.lsp.clone();
-        let registered_buffer = server
-            .registered_buffers
-            .get_mut(&buffer.entity_id())
-            .unwrap();
+        let Some(registered_buffer) = server.registered_buffers.get_mut(&buffer.entity_id()) else {
+            return Task::ready(Err(anyhow::anyhow!("buffer not registered")));
+        };
         let pending_snapshot = registered_buffer.report_changes(buffer, cx);
         let buffer = buffer.read(cx);
         let uri = registered_buffer.uri.clone();