git_ui: Branch picker improvements (#26287)

- Truncate branch names based on the width of the picker
- Use a footer for "Create branch" instead of a picker entry

Still to do:

- [x] Select the footer button when no matches and run the create logic
on `enter`
- [x] Make it possible to quickly select the footer button from the
keyboard when there are matches

Release Notes:

- Git Beta: Removed limitation that made it impossible to create a
branch from the branch picker when it too closely resembled an existing
branch name

crates/assistant2/src/context_picker/fetch_context_picker.rs

@@ -167,8 +167,8 @@ impl PickerDelegate for FetchContextPickerDelegate {
         }
     }
 
-    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> SharedString {
+    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
-        "Enter the URL that you would like to fetch".into()
+        Some("Enter the URL that you would like to fetch".into())
     }
 
     fn selected_index(&self) -> usize {

crates/collab/src/tests/integration_tests.rs

@@ -6770,7 +6770,7 @@ async fn test_remote_git_branches(
 
     assert_eq!(branches_b, branches_set);
 
-    cx_b.update(|cx| repo_b.read(cx).change_branch(new_branch.to_string()))
+    cx_b.update(|cx| repo_b.read(cx).change_branch(new_branch))
         .await
         .unwrap()
         .unwrap();
@@ -6790,23 +6790,15 @@ async fn test_remote_git_branches(
     assert_eq!(host_branch.name, branches[2]);
 
     // Also try creating a new branch
-    cx_b.update(|cx| {
+    cx_b.update(|cx| repo_b.read(cx).create_branch("totally-new-branch"))
-        repo_b
+        .await
-            .read(cx)
+        .unwrap()
-            .create_branch("totally-new-branch".to_string())
+        .unwrap();
-    })
-    .await
-    .unwrap()
-    .unwrap();
 
-    cx_b.update(|cx| {
+    cx_b.update(|cx| repo_b.read(cx).change_branch("totally-new-branch"))
-        repo_b
+        .await
-            .read(cx)
+        .unwrap()
-            .change_branch("totally-new-branch".to_string())
+        .unwrap();
-    })
-    .await
-    .unwrap()
-    .unwrap();
 
     executor.run_until_parked();
 

crates/collab/src/tests/remote_editing_collaboration_tests.rs

@@ -294,7 +294,7 @@ async fn test_ssh_collaboration_git_branches(
 
     assert_eq!(&branches_b, &branches_set);
 
-    cx_b.update(|cx| repo_b.read(cx).change_branch(new_branch.to_string()))
+    cx_b.update(|cx| repo_b.read(cx).change_branch(new_branch))
         .await
         .unwrap()
         .unwrap();
@@ -316,23 +316,15 @@ async fn test_ssh_collaboration_git_branches(
     assert_eq!(server_branch.name, branches[2]);
 
     // Also try creating a new branch
-    cx_b.update(|cx| {
+    cx_b.update(|cx| repo_b.read(cx).create_branch("totally-new-branch"))
-        repo_b
+        .await
-            .read(cx)
+        .unwrap()
-            .create_branch("totally-new-branch".to_string())
+        .unwrap();
-    })
-    .await
-    .unwrap()
-    .unwrap();
 
-    cx_b.update(|cx| {
+    cx_b.update(|cx| repo_b.read(cx).change_branch("totally-new-branch"))
-        repo_b
+        .await
-            .read(cx)
+        .unwrap()
-            .change_branch("totally-new-branch".to_string())
+        .unwrap();
-    })
-    .await
-    .unwrap()
-    .unwrap();
 
     executor.run_until_parked();
 

crates/file_finder/src/new_path_prompt.rs

@@ -436,8 +436,8 @@ impl PickerDelegate for NewPathDelegate {
         )
     }
 
-    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> SharedString {
+    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
-        "Type a path...".into()
+        Some("Type a path...".into())
     }
 
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {

crates/file_finder/src/open_path_prompt.rs

@@ -347,12 +347,14 @@ impl PickerDelegate for OpenPathDelegate {
         )
     }
 
-    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> SharedString {
+    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
-        if let Some(error) = self.directory_state.as_ref().and_then(|s| s.error.clone()) {
+        let text = if let Some(error) = self.directory_state.as_ref().and_then(|s| s.error.clone())
+        {
             error
         } else {
             "No such file or directory".into()
-        }
+        };
+        Some(text)
     }
 
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {

crates/git_ui/src/branch_picker.rs

@@ -4,13 +4,15 @@ use fuzzy::{StringMatch, StringMatchCandidate};
 use git::repository::Branch;
 use gpui::{
     rems, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
-    InteractiveElement, IntoElement, ParentElement, Render, SharedString, Styled, Subscription,
+    InteractiveElement, IntoElement, Modifiers, ModifiersChangedEvent, ParentElement, Render,
-    Task, Window,
+    SharedString, Styled, Subscription, Task, Window,
 };
 use picker::{Picker, PickerDelegate};
 use project::git::Repository;
 use std::sync::Arc;
-use ui::{prelude::*, HighlightedLabel, ListItem, ListItemSpacing, PopoverMenuHandle};
+use ui::{
+    prelude::*, HighlightedLabel, KeyBinding, ListItem, ListItemSpacing, PopoverMenuHandle, Tooltip,
+};
 use util::ResultExt;
 use workspace::notifications::DetachAndPromptErr;
 use workspace::{ModalView, Workspace};
@@ -51,7 +53,7 @@ pub fn open(
     let repository = workspace.project().read(cx).active_repository(cx).clone();
     let style = BranchListStyle::Modal;
     workspace.toggle_modal(window, cx, |window, cx| {
-        BranchList::new(repository, style, 34., window, cx)
+        BranchList::new(repository, style, rems(34.), window, cx)
     })
 }
 
@@ -61,7 +63,7 @@ pub fn popover(
     cx: &mut App,
 ) -> Entity<BranchList> {
     cx.new(|cx| {
-        let list = BranchList::new(repository, BranchListStyle::Popover, 15., window, cx);
+        let list = BranchList::new(repository, BranchListStyle::Popover, rems(15.), window, cx);
         list.focus_handle(cx).focus(window);
         list
     })
@@ -74,7 +76,7 @@ enum BranchListStyle {
 }
 
 pub struct BranchList {
-    rem_width: f32,
+    width: Rems,
     pub popover_handle: PopoverMenuHandle<Self>,
     pub picker: Entity<Picker<BranchListDelegate>>,
     _subscription: Subscription,
@@ -84,7 +86,7 @@ impl BranchList {
     fn new(
         repository: Option<Entity<Repository>>,
         style: BranchListStyle,
-        rem_width: f32,
+        width: Rems,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
@@ -109,7 +111,7 @@ impl BranchList {
         })
         .detach_and_log_err(cx);
 
-        let delegate = BranchListDelegate::new(repository.clone(), style, 20);
+        let delegate = BranchListDelegate::new(repository.clone(), style, (1.6 * width.0) as usize);
         let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
 
         let _subscription = cx.subscribe(&picker, |_, _, _, cx| {
@@ -118,11 +120,21 @@ impl BranchList {
 
         Self {
             picker,
-            rem_width,
+            width,
             popover_handle,
             _subscription,
         }
     }
+
+    fn handle_modifiers_changed(
+        &mut self,
+        ev: &ModifiersChangedEvent,
+        _: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.picker
+            .update(cx, |picker, _| picker.delegate.modifiers = ev.modifiers)
+    }
 }
 impl ModalView for BranchList {}
 impl EventEmitter<DismissEvent> for BranchList {}
@@ -136,7 +148,8 @@ impl Focusable for BranchList {
 impl Render for BranchList {
     fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         v_flex()
-            .w(rems(self.rem_width))
+            .w(self.width)
+            .on_modifiers_changed(cx.listener(Self::handle_modifiers_changed))
             .child(self.picker.clone())
             .on_mouse_down_out({
                 cx.listener(move |this, _, window, cx| {
@@ -152,7 +165,6 @@ impl Render for BranchList {
 enum BranchEntry {
     Branch(StringMatch),
     History(String),
-    NewBranch { name: String },
 }
 
 impl BranchEntry {
@@ -160,7 +172,6 @@ impl BranchEntry {
         match self {
             Self::Branch(branch) => &branch.string,
             Self::History(branch) => &branch,
-            Self::NewBranch { name } => &name,
         }
     }
 }
@@ -174,6 +185,7 @@ pub struct BranchListDelegate {
     last_query: String,
     /// Max length of branch name before we truncate it and add a trailing `...`.
     branch_name_trailoff_after: usize,
+    modifiers: Modifiers,
 }
 
 impl BranchListDelegate {
@@ -190,14 +202,37 @@ impl BranchListDelegate {
             selected_index: 0,
             last_query: Default::default(),
             branch_name_trailoff_after,
+            modifiers: Default::default(),
         }
     }
 
-    pub fn branch_count(&self) -> usize {
+    fn has_exact_match(&self, target: &str) -> bool {
-        self.matches
+        self.matches.iter().any(|mat| match mat {
-            .iter()
+            BranchEntry::Branch(branch) => branch.string == target,
-            .filter(|item| matches!(item, BranchEntry::Branch(_)))
+            _ => false,
-            .count()
+        })
+    }
+
+    fn create_branch(
+        &self,
+        new_branch_name: SharedString,
+        window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) {
+        let Some(repo) = self.repo.clone() else {
+            return;
+        };
+        cx.spawn(|_, cx| async move {
+            cx.update(|cx| repo.read(cx).create_branch(&new_branch_name))?
+                .await??;
+            cx.update(|cx| repo.read(cx).change_branch(&new_branch_name))?
+                .await??;
+            Ok(())
+        })
+        .detach_and_prompt_err("Failed to create branch", window, cx, |e, _, _| {
+            Some(e.to_string())
+        });
+        cx.emit(DismissEvent);
     }
 }
 
@@ -281,12 +316,6 @@ impl PickerDelegate for BranchListDelegate {
                     let delegate = &mut picker.delegate;
                     delegate.matches = matches;
                     if delegate.matches.is_empty() {
-                        if !query.is_empty() {
-                            delegate.matches.push(BranchEntry::NewBranch {
-                                name: query.trim().replace(' ', "-"),
-                            });
-                        }
-
                         delegate.selected_index = 0;
                     } else {
                         delegate.selected_index =
@@ -298,7 +327,16 @@ impl PickerDelegate for BranchListDelegate {
         })
     }
 
-    fn confirm(&mut self, _: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
+    fn confirm(&mut self, secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
+        let new_branch_name = SharedString::from(self.last_query.trim().replace(" ", "-"));
+        if !new_branch_name.is_empty()
+            && !self.has_exact_match(&new_branch_name)
+            && ((self.selected_index == 0 && self.matches.len() == 0) || secondary)
+        {
+            self.create_branch(new_branch_name, window, cx);
+            return;
+        }
+
         let Some(branch) = self.matches.get(self.selected_index()) else {
             return;
         };
@@ -337,13 +375,7 @@ impl PickerDelegate for BranchListDelegate {
                                 ..
                             })
                             | BranchEntry::History(branch_name) => {
-                                cx.update(|cx| repo.read(cx).change_branch(branch_name))?
+                                cx.update(|cx| repo.read(cx).change_branch(&branch_name))?
-                                    .await?
-                            }
-                            BranchEntry::NewBranch { name: branch_name } => {
-                                cx.update(|cx| repo.read(cx).create_branch(branch_name.clone()))?
-                                    .await??;
-                                cx.update(|cx| repo.read(cx).change_branch(branch_name))?
                                     .await?
                             }
                         }
@@ -405,10 +437,61 @@ impl PickerDelegate for BranchListDelegate {
                         el.child(HighlightedLabel::new(shortened_branch_name, highlights))
                     }
                     BranchEntry::History(_) => el.child(Label::new(shortened_branch_name)),
-                    BranchEntry::NewBranch { name } => {
-                        el.child(Label::new(format!("Create branch '{name}'")))
-                    }
                 }),
         )
     }
+
+    fn render_footer(
+        &self,
+        window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Option<AnyElement> {
+        let new_branch_name = SharedString::from(self.last_query.trim().replace(" ", "-"));
+        let handle = cx.weak_entity();
+        Some(
+            h_flex()
+                .w_full()
+                .p_2()
+                .gap_2()
+                .border_t_1()
+                .border_color(cx.theme().colors().border_variant)
+                .when(
+                    !new_branch_name.is_empty() && !self.has_exact_match(&new_branch_name),
+                    |el| {
+                        el.child(
+                            Button::new(
+                                "create-branch",
+                                format!("Create branch '{new_branch_name}'",),
+                            )
+                            .key_binding(KeyBinding::for_action(
+                                &menu::SecondaryConfirm,
+                                window,
+                                cx,
+                            ))
+                            .toggle_state(
+                                self.modifiers.secondary()
+                                    || (self.selected_index == 0 && self.matches.len() == 0),
+                            )
+                            .tooltip(Tooltip::for_action_title(
+                                "Create branch",
+                                &menu::SecondaryConfirm,
+                            ))
+                            .on_click(move |_, window, cx| {
+                                let new_branch_name = new_branch_name.clone();
+                                if let Some(picker) = handle.upgrade() {
+                                    picker.update(cx, |picker, cx| {
+                                        picker.delegate.create_branch(new_branch_name, window, cx)
+                                    });
+                                }
+                            }),
+                        )
+                    },
+                )
+                .into_any(),
+        )
+    }
+
+    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
+        None
+    }
 }

crates/gpui/src/color.rs

@@ -683,11 +683,11 @@ impl Default for Background {
 }
 
 /// Creates a hash pattern background
-pub fn pattern_slash(color: Hsla, thickness: f32) -> Background {
+pub fn pattern_slash(color: Hsla, height: f32) -> Background {
     Background {
         tag: BackgroundTag::PatternSlash,
         solid: color,
-        gradient_angle_or_pattern_height: thickness,
+        gradient_angle_or_pattern_height: height,
         ..Default::default()
     }
 }

crates/picker/src/picker.rs

@@ -96,8 +96,8 @@ pub trait PickerDelegate: Sized + 'static {
         None
     }
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str>;
-    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> SharedString {
+    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
-        "No matches".into()
+        Some("No matches".into())
     }
     fn update_matches(
         &mut self,
@@ -844,18 +844,17 @@ impl<D: PickerDelegate> Render for Picker<D> {
                 )
             })
             .when(self.delegate.match_count() == 0, |el| {
-                el.child(
+                el.when_some(self.delegate.no_matches_text(window, cx), |el, text| {
-                    v_flex().flex_grow().py_2().child(
+                    el.child(
-                        ListItem::new("empty_state")
+                        v_flex().flex_grow().py_2().child(
-                            .inset(true)
+                            ListItem::new("empty_state")
-                            .spacing(ListItemSpacing::Sparse)
+                                .inset(true)
-                            .disabled(true)
+                                .spacing(ListItemSpacing::Sparse)
-                            .child(
+                                .disabled(true)
-                                Label::new(self.delegate.no_matches_text(window, cx))
+                                .child(Label::new(text).color(Color::Muted)),
-                                    .color(Color::Muted),
+                        ),
-                            ),
+                    )
-                    ),
+                })
-                )
             })
             .children(self.delegate.render_footer(window, cx))
             .children(match &self.head {

crates/project/src/git.rs

@@ -636,7 +636,7 @@ impl GitStore {
 
         repository_handle
             .update(&mut cx, |repository_handle, _| {
-                repository_handle.create_branch(branch_name)
+                repository_handle.create_branch(&branch_name)
             })?
             .await??;
 
@@ -656,7 +656,7 @@ impl GitStore {
 
         repository_handle
             .update(&mut cx, |repository_handle, _| {
-                repository_handle.change_branch(branch_name)
+                repository_handle.change_branch(&branch_name)
             })?
             .await??;
 
@@ -1695,7 +1695,8 @@ impl Repository {
         })
     }
 
-    pub fn create_branch(&self, branch_name: String) -> oneshot::Receiver<Result<()>> {
+    pub fn create_branch(&self, branch_name: &str) -> oneshot::Receiver<Result<()>> {
+        let branch_name = branch_name.to_owned();
         self.send_job(|repo| async move {
             match repo {
                 GitRepo::Local(git_repository) => git_repository.create_branch(&branch_name),
@@ -1720,7 +1721,8 @@ impl Repository {
         })
     }
 
-    pub fn change_branch(&self, branch_name: String) -> oneshot::Receiver<Result<()>> {
+    pub fn change_branch(&self, branch_name: &str) -> oneshot::Receiver<Result<()>> {
+        let branch_name = branch_name.to_owned();
         self.send_job(|repo| async move {
             match repo {
                 GitRepo::Local(git_repository) => git_repository.change_branch(&branch_name),

crates/prompt_library/src/prompt_library.rs

@@ -179,12 +179,13 @@ impl PickerDelegate for PromptPickerDelegate {
         self.matches.len()
     }
 
-    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> SharedString {
+    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
-        if self.store.prompt_count() == 0 {
+        let text = if self.store.prompt_count() == 0 {
             "No prompts.".into()
         } else {
             "No prompts found matching your search.".into()
-        }
+        };
+        Some(text)
     }
 
     fn selected_index(&self) -> usize {

crates/recent_projects/src/recent_projects.rs

@@ -351,12 +351,13 @@ impl PickerDelegate for RecentProjectsDelegate {
 
     fn dismissed(&mut self, _window: &mut Window, _: &mut Context<Picker<Self>>) {}
 
-    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> SharedString {
+    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
-        if self.workspaces.is_empty() {
+        let text = if self.workspaces.is_empty() {
             "Recently opened projects will show up here".into()
         } else {
             "No matches".into()
-        }
+        };
+        Some(text)
     }
 
     fn render_match(

crates/remote_server/src/remote_editing_tests.rs

@@ -1361,7 +1361,7 @@ async fn test_remote_git_branches(cx: &mut TestAppContext, server_cx: &mut TestA
 
     assert_eq!(&remote_branches, &branches_set);
 
-    cx.update(|cx| repository.read(cx).change_branch(new_branch.to_string()))
+    cx.update(|cx| repository.read(cx).change_branch(new_branch))
         .await
         .unwrap()
         .unwrap();
@@ -1383,23 +1383,15 @@ async fn test_remote_git_branches(cx: &mut TestAppContext, server_cx: &mut TestA
     assert_eq!(server_branch.name, branches[2]);
 
     // Also try creating a new branch
-    cx.update(|cx| {
+    cx.update(|cx| repository.read(cx).create_branch("totally-new-branch"))
-        repository
+        .await
-            .read(cx)
+        .unwrap()
-            .create_branch("totally-new-branch".to_string())
+        .unwrap();
-    })
-    .await
-    .unwrap()
-    .unwrap();
 
-    cx.update(|cx| {
+    cx.update(|cx| repository.read(cx).change_branch("totally-new-branch"))
-        repository
+        .await
-            .read(cx)
+        .unwrap()
-            .change_branch("totally-new-branch".to_string())
+        .unwrap();
-    })
-    .await
-    .unwrap()
-    .unwrap();
 
     cx.run_until_parked();
 

crates/tab_switcher/src/tab_switcher.rs

@@ -325,8 +325,8 @@ impl PickerDelegate for TabSwitcherDelegate {
         Arc::default()
     }
 
-    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> SharedString {
+    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
-        "No tabs".into()
+        Some("No tabs".into())
     }
 
     fn match_count(&self) -> usize {