From 1c4bb60209950770debdb23a7a63c899d069d3ef Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Tue, 11 Nov 2025 11:55:19 +0100
Subject: [PATCH] gpui: Fix invalid unwrap in windows window creation (#42426)

Fixes ZED-34M

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 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 a9217a85e3..0050fa4bc0 100644
--- a/crates/gpui/src/platform/windows/window.rs
+++ b/crates/gpui/src/platform/windows/window.rs
@@ -453,8 +453,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 ecfe169b47..90675e364b 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -7651,7 +7651,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();