From b0c8952b0c70b22841e05e3668961c8f7832ca57 Mon Sep 17 00:00:00 2001 From: "zed-zippy[bot]" <234243425+zed-zippy[bot]@users.noreply.github.com> Date: Tue, 11 Nov 2025 12:12:18 +0100 Subject: [PATCH] gpui: Fix invalid unwrap in windows window creation (#42426) (cherry-pick to preview) (#42429) Cherry-pick of #42426 to preview ---- Fixes ZED-34M Release Notes: - N/A *or* Added/Fixed/Improved ... Co-authored-by: Lukas Wirth --- crates/gpui/src/platform/windows/window.rs | 3 ++- crates/project/src/lsp_store.rs | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/crates/gpui/src/platform/windows/window.rs b/crates/gpui/src/platform/windows/window.rs index cbf9cc77cf416f7ed8971548f62b72176ff00765..397b0ec25db458a53f0b88d186b842e3f3bf4364 100644 --- a/crates/gpui/src/platform/windows/window.rs +++ b/crates/gpui/src/platform/windows/window.rs @@ -452,8 +452,9 @@ impl WindowsWindow { // Failure to create a `WindowsWindowState` can cause window creation to fail, // so check the inner result first. - let this = context.inner.take().unwrap()?; + let this = context.inner.take().transpose()?; let hwnd = creation_result?; + let this = this.unwrap(); register_drag_drop(&this)?; configure_dwm_dark_mode(hwnd, appearance); diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs index a6d267b0f9f3dc7c3f22f5466ac19fea98cd0bdd..fed95e8bbbb88777c0f3386af16a3f53bafac7f5 100644 --- a/crates/project/src/lsp_store.rs +++ b/crates/project/src/lsp_store.rs @@ -7643,7 +7643,10 @@ impl LspStore { let buffer = buffer.read(cx); let file = File::from_dyn(buffer.file())?; let abs_path = file.as_local()?.abs_path(cx); - let uri = lsp::Uri::from_file_path(abs_path).unwrap(); + let uri = lsp::Uri::from_file_path(&abs_path) + .ok() + .with_context(|| format!("Failed to convert path to URI: {}", abs_path.display())) + .unwrap(); let next_snapshot = buffer.text_snapshot(); for language_server in language_servers { let language_server = language_server.clone();