From 50504793e6562b239dcd9399bc668445fae55f29 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Mon, 3 Nov 2025 13:07:13 +0100 Subject: [PATCH] file_finder: Fix highlighting panic in open path prompt (#41808) Closes https://github.com/zed-industries/zed/issues/41249 Couldn't quite come up with a test case here but verified it works. Release Notes: - Fixed a panic in file finder when deleting characters --- crates/file_finder/src/open_path_prompt.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/file_finder/src/open_path_prompt.rs b/crates/file_finder/src/open_path_prompt.rs index 694ef1eaceb720c3b63d4ca9d243ab73e9442970..f29c0e6cd20f423dd9073abced0182f272b588c9 100644 --- a/crates/file_finder/src/open_path_prompt.rs +++ b/crates/file_finder/src/open_path_prompt.rs @@ -711,7 +711,9 @@ impl PickerDelegate for OpenPathDelegate { match &self.directory_state { DirectoryState::List { parent_path, .. } => { - let (label, indices) = if *parent_path == self.prompt_root { + let (label, indices) = if is_current_dir_candidate { + ("open this directory".to_string(), vec![]) + } else if *parent_path == self.prompt_root { match_positions.iter_mut().for_each(|position| { *position += self.prompt_root.len(); }); @@ -719,8 +721,6 @@ impl PickerDelegate for OpenPathDelegate { format!("{}{}", self.prompt_root, candidate.path.string), match_positions, ) - } else if is_current_dir_candidate { - ("open this directory".to_string(), vec![]) } else { (candidate.path.string, match_positions) };