update

crates/signed_ui/src/lib.rs

@@ -2,6 +2,7 @@ mod dropdown_button;
 mod nav_item;
 mod pixel_avatar;
 mod placeholder;
+mod ref_selector;
 mod segment_button;
 mod setting;
 mod status_badge;
@@ -17,6 +18,7 @@ pub use dropdown_button::DropdownButton;
 pub use nav_item::NavItem;
 pub use pixel_avatar::PixelAvatar;
 pub use placeholder::placeholder;
+pub use ref_selector::ref_selector_trigger;
 pub use segment_button::{CountBadge, SegmentButton};
 pub use setting::{SelectOption, setting_block, setting_row};
 pub use status_badge::status_badge;

crates/signed_ui/src/ref_selector.rs

@@ -0,0 +1,41 @@
+use assets::CustomIconName;
+use gpui::prelude::*;
+use gpui::{AnyElement, App, SharedString, div};
+use gpui_component::combobox::{Caret, ComboboxTriggerContext};
+use gpui_component::searchable_list::SearchableVec;
+use gpui_component::{ActiveTheme, Icon, Sizable, h_flex};
+
+/// The kind icon, the selection or placeholder, and the caret. `Combobox`
+/// replaces its default trigger entirely, the only way to show an icon inside it.
+pub fn ref_selector_trigger(
+    ctx: &ComboboxTriggerContext<SearchableVec<SharedString>>,
+    icon: CustomIconName,
+    cx: &App,
+) -> AnyElement {
+    let muted = cx.theme().muted_foreground;
+
+    h_flex()
+        .w_full()
+        .min_w_0()
+        .gap_1()
+        .items_center()
+        .child(Icon::new(icon).small().flex_shrink_0())
+        .child(
+            div()
+                .flex_1()
+                .min_w_0()
+                .overflow_hidden()
+                .text_ellipsis()
+                .whitespace_nowrap()
+                .when(ctx.selection().is_empty(), |this| this.text_color(muted))
+                .child(
+                    ctx.selection()
+                        .first()
+                        .map(|(_, item)| item.clone())
+                        .or_else(|| ctx.placeholder().cloned())
+                        .unwrap_or_default(),
+                ),
+        )
+        .child(Caret::new(ctx.size()).text_color(muted))
+        .into_any_element()
+}

crates/workspace/src/views/commit_diff/mod.rs

@@ -13,17 +13,15 @@ use gpui_component::resizable::{resizable_panel, v_resizable};
 use gpui_component::scroll::{ScrollableElement, Scrollbar};
 use gpui_component::spinner::Spinner;
 use gpui_component::tag::Tag;
-use gpui_component::tree::{TreeEntry, TreeState, tree};
+use gpui_component::tree::{TreeEntry, TreeItem, TreeState, tree};
 use gpui_component::{
     ActiveTheme, Sizable, StyledExt, VirtualListScrollHandle, h_flex, v_flex, v_virtual_list,
 };
-use signed_git::{CommitDiff, DiffStatus, FileCommit, FileDiff};
+use signed_git::{CommitDiff, DiffHunk, DiffLine, DiffLineKind, DiffStatus, FileCommit, FileDiff};
 use signed_ui::{placeholder, tree_row};
 use utils::relative_time_secs;
 
-use crate::views::repo::helpers::{
-    DIFF_ROW_HEIGHT, DiffRow, build_tree_items, diff_rows, find_item, render_diff_row, tree_items,
-};
+use crate::views::tree::{build_tree_items, tree_items};
 
 const TREE_WIDTH: f32 = 260.;
 
@@ -510,3 +508,180 @@ impl Render for CommitDiffView {
             .child(resizable_panel().child(body))
     }
 }
+
+const GUTTER_WIDTH: f32 = 44.;
+const DIFF_ROW_HEIGHT: f32 = 20.;
+
+#[derive(Clone, Copy)]
+enum DiffRow {
+    Hunk {
+        old_start: u32,
+        old_lines: u32,
+        new_start: u32,
+        new_lines: u32,
+    },
+    Line {
+        hunk: usize,
+        line: usize,
+    },
+}
+
+fn diff_rows(file: &FileDiff) -> Vec<DiffRow> {
+    let mut rows = Vec::new();
+    for (hunk_ix, hunk) in file.hunks.iter().enumerate() {
+        rows.push(DiffRow::Hunk {
+            old_start: hunk.old_start,
+            old_lines: hunk.old_lines,
+            new_start: hunk.new_start,
+            new_lines: hunk.new_lines,
+        });
+        rows.extend((0..hunk.lines.len()).map(|line| DiffRow::Line {
+            hunk: hunk_ix,
+            line,
+        }));
+    }
+    rows
+}
+
+fn render_diff_row(hunks: &[DiffHunk], row: DiffRow, cx: &App) -> AnyElement {
+    match row {
+        DiffRow::Hunk {
+            old_start,
+            old_lines,
+            new_start,
+            new_lines,
+        } => div()
+            .px_2()
+            .w_full()
+            .h(px(DIFF_ROW_HEIGHT))
+            .font_family(cx.theme().mono_font_family.clone())
+            .text_xs()
+            .bg(cx.theme().muted)
+            .border_y(px(1.))
+            .border_color(cx.theme().border)
+            .text_color(cx.theme().muted_foreground)
+            .child(SharedString::from(format!(
+                "@@ -{},{} +{},{} @@",
+                old_start, old_lines, new_start, new_lines
+            )))
+            .into_any_element(),
+        DiffRow::Line { hunk, line } => render_diff_line(&hunks[hunk].lines[line], cx),
+    }
+}
+
+fn render_diff_line(line: &DiffLine, cx: &App) -> AnyElement {
+    let bg = match line.kind {
+        DiffLineKind::Addition => Some(cx.theme().success.opacity(0.2)),
+        DiffLineKind::Deletion => Some(cx.theme().danger.opacity(0.2)),
+        DiffLineKind::Context => None,
+    };
+    let gutter = cx.theme().muted_foreground;
+
+    // Fixed height and nowrap, the virtual list assumes every row has the same height.
+    // Long lines are clipped instead of wrapped.
+    h_flex()
+        .w_full()
+        .h(px(DIFF_ROW_HEIGHT))
+        .items_center()
+        .font_family(cx.theme().mono_font_family.clone())
+        .text_xs()
+        .when_some(bg, |this, bg| this.bg(bg))
+        .child(
+            div()
+                .w(px(GUTTER_WIDTH))
+                .flex_none()
+                .pr_2()
+                .text_right()
+                .text_color(gutter)
+                .child(line.old.map(|n| n.to_string()).unwrap_or_default()),
+        )
+        .child(
+            div()
+                .w(px(GUTTER_WIDTH))
+                .flex_none()
+                .pr_2()
+                .text_right()
+                .text_color(gutter)
+                .child(line.new.map(|n| n.to_string()).unwrap_or_default()),
+        )
+        .child(
+            div()
+                .flex_1()
+                .min_w_0()
+                .overflow_hidden()
+                .whitespace_nowrap()
+                .text_color(cx.theme().foreground)
+                .child(line.text.clone()),
+        )
+        .into_any_element()
+}
+
+fn find_item<'a>(items: &'a [TreeItem], id: Option<&str>) -> Option<&'a TreeItem> {
+    let id = id?;
+    items.iter().find_map(|item| {
+        if item.id.as_ref() == id {
+            Some(item)
+        } else {
+            find_item(&item.children, Some(id))
+        }
+    })
+}
+
+pub(crate) const COMMIT_ROW_HEIGHT: f32 = 56.;
+
+pub(crate) fn commit_row(
+    ix: usize,
+    commit: &FileCommit,
+    on_click: impl Fn(&mut Window, &mut App) + 'static,
+    cx: &App,
+) -> AnyElement {
+    h_flex()
+        .id(ix)
+        .px_4()
+        .h(px(COMMIT_ROW_HEIGHT))
+        .w_full()
+        .gap_3()
+        .items_center()
+        .border_b(px(1.))
+        .border_color(cx.theme().border)
+        .hover(|this| this.bg(cx.theme().list_hover))
+        .child(
+            v_flex()
+                .flex_1()
+                .min_w_0()
+                .gap_0p5()
+                .justify_center()
+                .child(
+                    h_flex()
+                        .gap_2()
+                        .items_center()
+                        .overflow_hidden()
+                        .child(
+                            div()
+                                .font_family(cx.theme().mono_font_family.clone())
+                                .text_xs()
+                                .text_color(cx.theme().muted_foreground)
+                                .child(commit.id.clone()),
+                        )
+                        .child(
+                            div()
+                                .flex_1()
+                                .min_w_0()
+                                .text_sm()
+                                .text_ellipsis()
+                                .whitespace_nowrap()
+                                .child(commit.summary.clone()),
+                        ),
+                )
+                .child(
+                    h_flex()
+                        .gap_2()
+                        .text_xs()
+                        .text_color(cx.theme().muted_foreground)
+                        .child(commit.author.clone())
+                        .child(relative_time_secs(commit.time)),
+                ),
+        )
+        .on_click(move |_event, window, cx| on_click(window, cx))
+        .into_any_element()
+}

crates/workspace/src/views/discussion.rs

@@ -0,0 +1,217 @@
+use assets::CustomIconName;
+use gpui::prelude::*;
+use gpui::{AnyElement, App, Entity, SharedString, div, px};
+use gpui_component::button::{Button, ButtonVariants};
+use gpui_component::input::{Textarea, TextareaState};
+use gpui_component::tag::Tag;
+use gpui_component::{ActiveTheme, Icon, Sizable, StyledExt, h_flex, v_flex};
+use nostr::prelude::{Event, EventId, PublicKey};
+use signed_state::{ProfileStore, RepoStore};
+use signed_ui::UserAvatar;
+use utils::relative_time;
+
+pub(crate) fn issue_roots(store: &RepoStore) -> &[Event] {
+    &store.issues
+}
+
+pub(crate) fn pr_roots(store: &RepoStore) -> &[Event] {
+    &store.pull_requests
+}
+
+fn sidebar_title(text: &str, cx: &App) -> AnyElement {
+    div()
+        .text_xs()
+        .font_semibold()
+        .text_color(cx.theme().muted_foreground)
+        .child(text.to_string())
+        .into_any_element()
+}
+
+pub(crate) fn sidebar_section(
+    store: &Entity<RepoStore>,
+    id: EventId,
+    roots: fn(&RepoStore) -> &[Event],
+    top_gap: bool,
+    cx: &App,
+) -> AnyElement {
+    let store = store.read(cx);
+    let Some(root) = roots(store).iter().find(|event| event.id == id) else {
+        // The caller bails out when the root is missing.
+        return div().into_any_element();
+    };
+    let profile_store = ProfileStore::global(cx);
+
+    // Participants, the root author plus everyone who commented.
+    let mut participants: Vec<PublicKey> = vec![root.pubkey];
+    participants.extend(store.comments_of(&root.id).map(|comment| comment.pubkey));
+    participants.sort_by_key(PublicKey::to_hex);
+    participants.dedup();
+
+    // Labels are NIP-34 `t` hashtag tags on the event.
+    let labels: Vec<String> = root.tags.hashtags().map(|tag| tag.to_string()).collect();
+
+    v_flex()
+        .w(px(240.))
+        .h_full()
+        .flex_none()
+        .px_4()
+        .gap_4()
+        .border_l(px(1.))
+        .border_color(cx.theme().sidebar_border)
+        .child(
+            v_flex()
+                .when(top_gap, |this| this.mt_4())
+                .gap_2()
+                .child(sidebar_title("Participants", cx))
+                .children(participants.iter().map(|pubkey| {
+                    let profile = profile_store.read(cx).get(pubkey);
+                    let name = profile.name();
+                    let picture = profile.picture();
+
+                    h_flex()
+                        .gap_1()
+                        .items_center()
+                        .child(UserAvatar::new(name.clone()).picture(picture))
+                        .child(div().text_sm().truncate().text_ellipsis().child(name))
+                        .into_any_element()
+                })),
+        )
+        .child(
+            v_flex()
+                .gap_2()
+                .child(sidebar_title("Labels", cx))
+                .map(|this| {
+                    if labels.is_empty() {
+                        this.child(
+                            div()
+                                .text_sm()
+                                .text_color(cx.theme().muted_foreground)
+                                .child("None yet."),
+                        )
+                    } else {
+                        this.child(h_flex().gap_1().children({
+                            let mut items = vec![];
+
+                            for label in labels.iter() {
+                                items.push(
+                                    Tag::secondary()
+                                        .outline()
+                                        .xsmall()
+                                        .child(SharedString::from(label)),
+                                );
+                            }
+
+                            items
+                        }))
+                    }
+                }),
+        )
+        .into_any_element()
+}
+
+pub(crate) fn comments_section(store: &Entity<RepoStore>, root: EventId, cx: &App) -> AnyElement {
+    let store = store.read(cx);
+    let comments: Vec<&Event> = store.comments_of(&root).collect();
+    let title = SharedString::from(format!("Discussions {}", comments.len()));
+
+    v_flex()
+        .gap_4()
+        .child(div().text_xs().font_semibold().child(title))
+        .children(comments.iter().map(|comment| {
+            let profile = ProfileStore::global(cx).read(cx).get(&comment.pubkey);
+            let author = profile.name();
+            let picture = profile.picture();
+            let age = relative_time(comment.created_at);
+            let content = SharedString::from(comment.content.as_str());
+
+            v_flex()
+                .gap_1()
+                .p_3()
+                .border_1()
+                .border_color(cx.theme().border)
+                .rounded(cx.theme().radius)
+                .child(
+                    h_flex()
+                        .gap_2()
+                        .text_sm()
+                        .child(
+                            h_flex()
+                                .gap_1()
+                                .child(UserAvatar::new(author.clone()).picture(picture))
+                                .child(author),
+                        )
+                        .child(
+                            div()
+                                .text_color(cx.theme().muted_foreground)
+                                .child("commented"),
+                        )
+                        .child(
+                            div()
+                                .text_color(cx.theme().muted_foreground)
+                                .child(SharedString::from(age)),
+                        ),
+                )
+                .child(div().text_sm().child(content))
+        }))
+        .into_any_element()
+}
+
+/// `roots` selects the root's list within the store, issues or pull requests.
+pub(crate) fn comment_form(
+    store: &Entity<RepoStore>,
+    root: EventId,
+    roots: fn(&RepoStore) -> &[Event],
+    comment_input: &Entity<TextareaState>,
+    button_id: &'static str,
+    cx: &App,
+) -> AnyElement {
+    let comment_input = comment_input.clone();
+    let store = store.clone();
+
+    v_flex()
+        .gap_2()
+        .child(
+            Textarea::new(&comment_input)
+                .h_24()
+                .text_color(cx.theme().muted_foreground)
+                .bg(cx.theme().muted),
+        )
+        .child(
+            h_flex()
+                .justify_between()
+                .child(
+                    h_flex()
+                        .gap_1()
+                        .text_xs()
+                        .text_color(cx.theme().muted_foreground)
+                        .child(Icon::new(CustomIconName::Markdown).small())
+                        .child("Markdown is supported"),
+                )
+                .child(
+                    Button::new(button_id)
+                        .primary()
+                        .label("Comment")
+                        .tooltip("Post comment")
+                        .on_click(move |_event, window, cx| {
+                            let content = comment_input.read(cx).value().trim().to_string();
+                            if content.is_empty() {
+                                return;
+                            }
+                            let Some(root) = roots(store.read(cx))
+                                .iter()
+                                .find(|event| event.id == root)
+                                .cloned()
+                            else {
+                                return;
+                            };
+                            store.update(cx, |store, cx| {
+                                store.comment(&root, content, cx);
+                            });
+                            comment_input.update(cx, |input, cx| {
+                                input.set_value("", window, cx);
+                            });
+                        }),
+                ),
+        )
+        .into_any_element()
+}

crates/workspace/src/views/issues/detail.rs

@@ -13,7 +13,7 @@ use signed_state::{ProfileStore, RepoStore};
 use signed_ui::{UserAvatar, placeholder, status_badge};
 use utils::relative_time;
 
-use crate::views::repo::helpers::{comment_form, comments_section, issue_roots, sidebar_section};
+use crate::views::discussion::{comment_form, comments_section, issue_roots, sidebar_section};
 
 pub struct IssueDetailView {
     focus_handle: FocusHandle,

crates/workspace/src/views/mod.rs

@@ -1,5 +1,6 @@
 mod commit_diff;
 mod dialog_state;
+pub(crate) mod discussion;
 mod inbox;
 mod issues;
 mod pull_requests;
@@ -7,6 +8,7 @@ mod repo;
 mod repo_list;
 mod send_patch;
 pub(crate) mod sidebar;
+pub(crate) mod tree;
 
 pub use inbox::InboxView;
 pub use repo::RepoDetailView;

crates/workspace/src/views/pull_requests/detail.rs

@@ -31,7 +31,7 @@ use signed_ui::{CountBadge, UserAvatar, placeholder, status_badge};
 use utils::{relative_time, relative_time_secs};
 
 use crate::views::commit_diff::{CommitDiffView, DiffPane};
-use crate::views::repo::helpers::{comment_form, comments_section, pr_roots, sidebar_section};
+use crate::views::discussion::{comment_form, comments_section, pr_roots, sidebar_section};
 
 const ROW_HEIGHT: f32 = 37.;
 

crates/workspace/src/views/pull_requests/new.rs

@@ -27,10 +27,9 @@ use signed_git::{
     worktree_commit_range_commits, worktree_commit_range_diff,
 };
 use signed_state::{Backend, CheckoutsStore, GitStore, RepoListStore, RepoStore};
-use signed_ui::{CountBadge, placeholder};
+use signed_ui::{CountBadge, placeholder, ref_selector_trigger};
 
-use crate::views::commit_diff::{CommitDiffView, DiffPane};
-use crate::views::repo::helpers::{COMMIT_ROW_HEIGHT, commit_row, ref_selector_trigger};
+use crate::views::commit_diff::{COMMIT_ROW_HEIGHT, CommitDiffView, DiffPane, commit_row};
 
 pub struct NewPullRequestView {
     focus_handle: FocusHandle,

crates/workspace/src/views/repo/files.rs

@@ -13,7 +13,6 @@ use gpui_component::{ActiveTheme, Sizable, StyledExt, h_flex, v_flex};
 use signed_ui::{placeholder, tree_row};
 
 use super::RepoDetailView;
-use crate::views::repo::helpers::{code_language, is_markdown_path};
 
 const TREE_WIDTH: f32 = 240.;
 pub(super) const MAX_PREVIEW_BYTES: usize = 1024 * 1024;
@@ -477,3 +476,67 @@ impl RepoDetailView {
         }
     }
 }
+
+/// The markdown fence language for a file path, or `None` for plain text.
+fn code_language(path: &str) -> Option<&'static str> {
+    let name = Path::new(path)
+        .file_name()
+        .and_then(|name| name.to_str())
+        .unwrap_or_default();
+
+    // Some common files are recognized by name rather than extension.
+    match name {
+        "Makefile" | "makefile" => return Some("make"),
+        "CMakeLists.txt" => return Some("cmake"),
+        _ => {}
+    }
+
+    let ext = Path::new(path).extension()?.to_str()?.to_ascii_lowercase();
+    Some(match ext.as_str() {
+        "rs" => "rust",
+        "toml" => "toml",
+        "json" | "jsonc" => "json",
+        "py" => "python",
+        "js" | "mjs" | "cjs" => "javascript",
+        "ts" | "mts" | "cts" => "typescript",
+        "tsx" | "jsx" => "tsx",
+        "go" => "go",
+        "c" | "h" => "c",
+        "cc" | "cpp" | "cxx" | "hh" | "hpp" | "hxx" => "cpp",
+        "cs" => "csharp",
+        "java" => "java",
+        "kt" | "kts" | "ktm" => "kotlin",
+        "swift" => "swift",
+        "php" | "phtml" => "php",
+        "rb" => "ruby",
+        "sh" | "bash" | "zsh" => "bash",
+        "yml" | "yaml" => "yaml",
+        "css" | "scss" | "sass" => "css",
+        "html" | "htm" => "html",
+        "lua" => "lua",
+        "sql" => "sql",
+        "proto" | "protobuf" => "proto",
+        "cmake" => "cmake",
+        "zig" => "zig",
+        "ex" | "exs" => "elixir",
+        "graphql" | "gql" => "graphql",
+        "diff" | "patch" => "diff",
+        "svelte" => "svelte",
+        "astro" => "astro",
+        "scala" => "scala",
+        _ => return None,
+    })
+}
+
+/// Whether a file path has a markdown extension.
+fn is_markdown_path(path: &str) -> bool {
+    Path::new(path)
+        .extension()
+        .and_then(|ext| ext.to_str())
+        .is_some_and(|ext| {
+            matches!(
+                ext.to_ascii_lowercase().as_str(),
+                "md" | "markdown" | "mdown" | "mkdn"
+            )
+        })
+}

crates/workspace/src/views/repo/header.rs

@@ -7,20 +7,23 @@ use gpui::{Anchor, AnyElement, ClipboardItem, Context, SharedString, div, px, re
 use gpui_base::{Button as BaseButton, Disableable, Popover};
 use gpui_component::button::{Button, ButtonVariants};
 use gpui_component::combobox::Combobox;
-use gpui_component::menu::DropdownMenu;
+use gpui_component::menu::{DropdownMenu, PopupMenu};
 use gpui_component::{
     ActiveTheme, Colorize, Icon, IconName, Sizable, StyledExt, ThemeStyled, h_flex, v_flex,
 };
+use nostr::nips::nip19::Nip19Coordinate;
 use nostr::prelude::{RelayUrl, ToBech32};
 use signed_core::Announcement;
 use signed_state::{Backend, ProfileStore, RepoListStore};
-use signed_ui::{CountBadge, DropdownButton, PixelAvatar, UserAvatar, copy_row};
+use signed_ui::{
+    CountBadge, DropdownButton, PixelAvatar, UserAvatar, copy_row, menu_copy_row, middle_truncate,
+    ref_selector_trigger,
+};
 
 use super::{RepoAction, RepoDetailView};
 use crate::views::issues::open_new_issue_dialog;
 use crate::views::pull_requests::new::open_new_pull_panel;
 use crate::views::repo::about::open_about_dialog;
-use crate::views::repo::helpers::{ShareTargets, ref_selector_trigger};
 use crate::views::send_patch::open_send_patch_panel;
 
 impl RepoDetailView {
@@ -712,3 +715,72 @@ fn fork_row(announcement: &Announcement, cx: &mut Context<RepoDetailView>) -> Op
         row.into_any_element()
     })
 }
+
+struct ShareTargets {
+    /// NIP-19 `naddr1...` of the announcement, with its announced relays.
+    naddr: String,
+    /// Hex ID of the announcement event itself.
+    event_id: String,
+    /// NIP-34 coordinate `30617:<pubkey>:<repo-id>`.
+    coordinate: String,
+    /// `https://gitworkshop.dev/<naddr>`
+    gitworkshop: String,
+    /// `https://ditto.pub/<naddr>`
+    ditto: String,
+}
+
+impl ShareTargets {
+    fn from_announcement(announcement: &Announcement) -> Self {
+        let addr = announcement.addr();
+        let coordinate = addr.to_string();
+        let naddr = Nip19Coordinate::new(addr, announcement.relays.iter().cloned())
+            .to_bech32()
+            .expect("a complete coordinate always encodes to naddr");
+
+        Self {
+            naddr: naddr.clone(),
+            event_id: announcement.event_id.to_bech32().unwrap(),
+            coordinate,
+            gitworkshop: format!("https://gitworkshop.dev/{naddr}"),
+            ditto: format!("https://ditto.pub/{naddr}"),
+        }
+    }
+
+    fn menu(&self, menu: PopupMenu) -> PopupMenu {
+        menu.min_w(px(340.))
+            .item(menu_copy_row(
+                "copy-gitworkshop",
+                "GitWorkshop",
+                truncate_naddr_link(&self.gitworkshop, 4),
+                self.gitworkshop.clone(),
+            ))
+            .item(menu_copy_row(
+                "copy-ditto",
+                "Ditto",
+                truncate_naddr_link(&self.ditto, 4),
+                self.ditto.clone(),
+            ))
+            .item(menu_copy_row(
+                "copy-event-id",
+                "Event ID",
+                middle_truncate(&self.event_id, 10, 10),
+                self.event_id.clone(),
+            ))
+            .item(menu_copy_row(
+                "copy-coordinate",
+                "Coordinate",
+                middle_truncate(&self.coordinate, 10, 10),
+                self.coordinate.clone(),
+            ))
+    }
+}
+
+fn truncate_naddr_link(url: &str, tail: usize) -> String {
+    let Some(end) = url.find("naddr1").map(|i| i + "naddr1".len()) else {
+        return url.to_string();
+    };
+    if url.len() - end <= tail + 3 {
+        return url.to_string();
+    }
+    format!("{}...{}", &url[..end], &url[url.len() - tail..])
+}

crates/workspace/src/views/repo/helpers.rs

@@ -1,721 +0,0 @@
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
-
-use assets::CustomIconName;
-use gpui::prelude::*;
-use gpui::{AnyElement, App, Entity, SharedString, Window, div, px};
-use gpui_component::button::{Button, ButtonVariants};
-use gpui_component::combobox::{Caret, ComboboxTriggerContext};
-use gpui_component::input::{Textarea, TextareaState};
-use gpui_component::menu::PopupMenu;
-use gpui_component::searchable_list::SearchableVec;
-use gpui_component::tag::Tag;
-use gpui_component::tree::TreeItem;
-use gpui_component::{ActiveTheme, Icon, Sizable, StyledExt, h_flex, v_flex};
-use nostr::nips::nip19::{Nip19Coordinate, ToBech32};
-use nostr::prelude::{Event, EventId, PublicKey};
-use signed_core::Announcement;
-use signed_git::{DiffHunk, DiffLine, DiffLineKind, FileCommit, FileDiff};
-use signed_state::{ProfileStore, RepoStore};
-use signed_ui::{UserAvatar, menu_copy_row, middle_truncate};
-use utils::{relative_time, relative_time_secs};
-
-pub(crate) struct TreeItemSeed {
-    /// Path of the node, relative to the worktree root.
-    id: String,
-    label: String,
-    children: Vec<TreeItemSeed>,
-}
-
-pub(crate) fn tree_items(seeds: Vec<TreeItemSeed>, expand_folders: bool) -> Vec<TreeItem> {
-    fn convert(seed: TreeItemSeed, expand_folders: bool) -> TreeItem {
-        let mut item = TreeItem::new(seed.id, seed.label);
-        if expand_folders && !seed.children.is_empty() {
-            item = item.expanded(true);
-        }
-        item.children = seed
-            .children
-            .into_iter()
-            .map(|seed| convert(seed, expand_folders))
-            .collect();
-        item
-    }
-
-    seeds
-        .into_iter()
-        .map(|seed| convert(seed, expand_folders))
-        .collect()
-}
-
-/// Build nested tree items from a flat entry list sorted dirs-first.
-pub(crate) fn build_tree_items(entries: &[PathBuf]) -> Vec<TreeItemSeed> {
-    // Node indices by full path, so parents resolve in constant time while inserting.
-    let mut index: HashMap<String, usize> = HashMap::new();
-    let mut nodes: Vec<(String, String, Vec<usize>)> = Vec::new();
-    let mut roots: Vec<usize> = Vec::new();
-
-    for entry in entries {
-        let mut parent: Option<usize> = None;
-        let mut path = String::new();
-        for part in entry.components() {
-            let label = part.as_os_str().to_string_lossy().into_owned();
-            path = if path.is_empty() {
-                label.clone()
-            } else {
-                format!("{path}/{label}")
-            };
-            let ix = *index.entry(path.clone()).or_insert_with(|| {
-                let ix = nodes.len();
-                nodes.push((path.clone(), label.clone(), Vec::new()));
-                match parent {
-                    Some(parent) => nodes[parent].2.push(ix),
-                    None => roots.push(ix),
-                }
-                ix
-            });
-            parent = Some(ix);
-        }
-    }
-
-    fn assemble(ix: usize, nodes: &[(String, String, Vec<usize>)]) -> TreeItemSeed {
-        let (id, label, children) = &nodes[ix];
-        TreeItemSeed {
-            id: id.clone(),
-            label: label.clone(),
-            children: children
-                .iter()
-                .map(|child| assemble(*child, nodes))
-                .collect(),
-        }
-    }
-
-    roots.iter().map(|root| assemble(*root, &nodes)).collect()
-}
-
-/// Sorted relative paths of a worktree snapshot.
-///
-/// Compared against the `worktree_paths` of a repository panel to skip
-/// rebuilding the explorer when a refresh left the worktree unchanged.
-pub(crate) fn sorted_worktree_paths(entries: &[PathBuf]) -> Vec<String> {
-    let mut paths: Vec<String> = entries
-        .iter()
-        .map(|path| path.to_string_lossy().into_owned())
-        .collect();
-    paths.sort();
-    paths
-}
-
-/// The markdown fence language for a file path, or `None` for plain text.
-pub(crate) fn code_language(path: &str) -> Option<&'static str> {
-    let name = Path::new(path)
-        .file_name()
-        .and_then(|name| name.to_str())
-        .unwrap_or_default();
-
-    // Some common files are recognized by name rather than extension.
-    match name {
-        "Makefile" | "makefile" => return Some("make"),
-        "CMakeLists.txt" => return Some("cmake"),
-        _ => {}
-    }
-
-    let ext = Path::new(path).extension()?.to_str()?.to_ascii_lowercase();
-    Some(match ext.as_str() {
-        "rs" => "rust",
-        "toml" => "toml",
-        "json" | "jsonc" => "json",
-        "py" => "python",
-        "js" | "mjs" | "cjs" => "javascript",
-        "ts" | "mts" | "cts" => "typescript",
-        "tsx" | "jsx" => "tsx",
-        "go" => "go",
-        "c" | "h" => "c",
-        "cc" | "cpp" | "cxx" | "hh" | "hpp" | "hxx" => "cpp",
-        "cs" => "csharp",
-        "java" => "java",
-        "kt" | "kts" | "ktm" => "kotlin",
-        "swift" => "swift",
-        "php" | "phtml" => "php",
-        "rb" => "ruby",
-        "sh" | "bash" | "zsh" => "bash",
-        "yml" | "yaml" => "yaml",
-        "css" | "scss" | "sass" => "css",
-        "html" | "htm" => "html",
-        "lua" => "lua",
-        "sql" => "sql",
-        "proto" | "protobuf" => "proto",
-        "cmake" => "cmake",
-        "zig" => "zig",
-        "ex" | "exs" => "elixir",
-        "graphql" | "gql" => "graphql",
-        "diff" | "patch" => "diff",
-        "svelte" => "svelte",
-        "astro" => "astro",
-        "scala" => "scala",
-        _ => return None,
-    })
-}
-
-/// Whether a file path has a markdown extension.
-pub(crate) fn is_markdown_path(path: &str) -> bool {
-    Path::new(path)
-        .extension()
-        .and_then(|ext| ext.to_str())
-        .is_some_and(|ext| {
-            matches!(
-                ext.to_ascii_lowercase().as_str(),
-                "md" | "markdown" | "mdown" | "mkdn"
-            )
-        })
-}
-
-pub(crate) struct ShareTargets {
-    /// NIP-19 `naddr1...` of the announcement, with its announced relays.
-    pub(crate) naddr: String,
-    /// Hex ID of the announcement event itself.
-    pub(crate) event_id: String,
-    /// NIP-34 coordinate `30617:<pubkey>:<repo-id>`.
-    pub(crate) coordinate: String,
-    /// `https://gitworkshop.dev/<naddr>`
-    pub(crate) gitworkshop: String,
-    /// `https://ditto.pub/<naddr>`
-    pub(crate) ditto: String,
-}
-
-impl ShareTargets {
-    pub(crate) fn from_announcement(announcement: &Announcement) -> Self {
-        let addr = announcement.addr();
-        let coordinate = addr.to_string();
-        let naddr = Nip19Coordinate::new(addr, announcement.relays.iter().cloned())
-            .to_bech32()
-            .expect("a complete coordinate always encodes to naddr");
-
-        Self {
-            naddr: naddr.clone(),
-            event_id: announcement.event_id.to_bech32().unwrap(),
-            coordinate,
-            gitworkshop: format!("https://gitworkshop.dev/{naddr}"),
-            ditto: format!("https://ditto.pub/{naddr}"),
-        }
-    }
-
-    pub(crate) fn menu(&self, menu: PopupMenu) -> PopupMenu {
-        menu.min_w(px(340.))
-            .item(menu_copy_row(
-                "copy-gitworkshop",
-                "GitWorkshop",
-                truncate_naddr_link(&self.gitworkshop, 4),
-                self.gitworkshop.clone(),
-            ))
-            .item(menu_copy_row(
-                "copy-ditto",
-                "Ditto",
-                truncate_naddr_link(&self.ditto, 4),
-                self.ditto.clone(),
-            ))
-            .item(menu_copy_row(
-                "copy-event-id",
-                "Event ID",
-                middle_truncate(&self.event_id, 10, 10),
-                self.event_id.clone(),
-            ))
-            .item(menu_copy_row(
-                "copy-coordinate",
-                "Coordinate",
-                middle_truncate(&self.coordinate, 10, 10),
-                self.coordinate.clone(),
-            ))
-    }
-}
-
-fn truncate_naddr_link(url: &str, tail: usize) -> String {
-    let Some(end) = url.find("naddr1").map(|i| i + "naddr1".len()) else {
-        return url.to_string();
-    };
-    if url.len() - end <= tail + 3 {
-        return url.to_string();
-    }
-    format!("{}...{}", &url[..end], &url[url.len() - tail..])
-}
-
-pub(crate) const GUTTER_WIDTH: f32 = 44.;
-pub(crate) const DIFF_ROW_HEIGHT: f32 = 20.;
-
-#[derive(Clone, Copy)]
-pub(crate) enum DiffRow {
-    Hunk {
-        old_start: u32,
-        old_lines: u32,
-        new_start: u32,
-        new_lines: u32,
-    },
-    Line {
-        hunk: usize,
-        line: usize,
-    },
-}
-
-pub(crate) fn diff_rows(file: &FileDiff) -> Vec<DiffRow> {
-    let mut rows = Vec::new();
-    for (hunk_ix, hunk) in file.hunks.iter().enumerate() {
-        rows.push(DiffRow::Hunk {
-            old_start: hunk.old_start,
-            old_lines: hunk.old_lines,
-            new_start: hunk.new_start,
-            new_lines: hunk.new_lines,
-        });
-        rows.extend((0..hunk.lines.len()).map(|line| DiffRow::Line {
-            hunk: hunk_ix,
-            line,
-        }));
-    }
-    rows
-}
-
-pub(crate) fn render_diff_row(hunks: &[DiffHunk], row: DiffRow, cx: &App) -> AnyElement {
-    match row {
-        DiffRow::Hunk {
-            old_start,
-            old_lines,
-            new_start,
-            new_lines,
-        } => div()
-            .px_2()
-            .w_full()
-            .h(px(DIFF_ROW_HEIGHT))
-            .font_family(cx.theme().mono_font_family.clone())
-            .text_xs()
-            .bg(cx.theme().muted)
-            .border_y(px(1.))
-            .border_color(cx.theme().border)
-            .text_color(cx.theme().muted_foreground)
-            .child(SharedString::from(format!(
-                "@@ -{},{} +{},{} @@",
-                old_start, old_lines, new_start, new_lines
-            )))
-            .into_any_element(),
-        DiffRow::Line { hunk, line } => render_diff_line(&hunks[hunk].lines[line], cx),
-    }
-}
-
-pub(crate) fn render_diff_line(line: &DiffLine, cx: &App) -> AnyElement {
-    let bg = match line.kind {
-        DiffLineKind::Addition => Some(cx.theme().success.opacity(0.2)),
-        DiffLineKind::Deletion => Some(cx.theme().danger.opacity(0.2)),
-        DiffLineKind::Context => None,
-    };
-    let gutter = cx.theme().muted_foreground;
-
-    // Fixed height and nowrap, the virtual list assumes every row has the same height.
-    // Long lines are clipped instead of wrapped.
-    h_flex()
-        .w_full()
-        .h(px(DIFF_ROW_HEIGHT))
-        .items_center()
-        .font_family(cx.theme().mono_font_family.clone())
-        .text_xs()
-        .when_some(bg, |this, bg| this.bg(bg))
-        .child(
-            div()
-                .w(px(GUTTER_WIDTH))
-                .flex_none()
-                .pr_2()
-                .text_right()
-                .text_color(gutter)
-                .child(line.old.map(|n| n.to_string()).unwrap_or_default()),
-        )
-        .child(
-            div()
-                .w(px(GUTTER_WIDTH))
-                .flex_none()
-                .pr_2()
-                .text_right()
-                .text_color(gutter)
-                .child(line.new.map(|n| n.to_string()).unwrap_or_default()),
-        )
-        .child(
-            div()
-                .flex_1()
-                .min_w_0()
-                .overflow_hidden()
-                .whitespace_nowrap()
-                .text_color(cx.theme().foreground)
-                .child(line.text.clone()),
-        )
-        .into_any_element()
-}
-
-pub(crate) fn find_item<'a>(items: &'a [TreeItem], id: Option<&str>) -> Option<&'a TreeItem> {
-    let id = id?;
-    items.iter().find_map(|item| {
-        if item.id.as_ref() == id {
-            Some(item)
-        } else {
-            find_item(&item.children, Some(id))
-        }
-    })
-}
-
-pub(crate) fn issue_roots(store: &RepoStore) -> &[Event] {
-    &store.issues
-}
-
-pub(crate) fn pr_roots(store: &RepoStore) -> &[Event] {
-    &store.pull_requests
-}
-
-/// The kind icon, the selection or placeholder, and the caret. `Combobox`
-/// replaces its default trigger entirely, the only way to show an icon inside it.
-pub(crate) fn ref_selector_trigger(
-    ctx: &ComboboxTriggerContext<SearchableVec<SharedString>>,
-    icon: CustomIconName,
-    cx: &App,
-) -> AnyElement {
-    let muted = cx.theme().muted_foreground;
-
-    h_flex()
-        .w_full()
-        .min_w_0()
-        .gap_1()
-        .items_center()
-        .child(Icon::new(icon).small().flex_shrink_0())
-        .child(
-            div()
-                .flex_1()
-                .min_w_0()
-                .overflow_hidden()
-                .text_ellipsis()
-                .whitespace_nowrap()
-                .when(ctx.selection().is_empty(), |this| this.text_color(muted))
-                .child(
-                    ctx.selection()
-                        .first()
-                        .map(|(_, item)| item.clone())
-                        .or_else(|| ctx.placeholder().cloned())
-                        .unwrap_or_default(),
-                ),
-        )
-        .child(Caret::new(ctx.size()).text_color(muted))
-        .into_any_element()
-}
-
-pub(crate) fn sidebar_title(text: &str, cx: &App) -> AnyElement {
-    div()
-        .text_xs()
-        .font_semibold()
-        .text_color(cx.theme().muted_foreground)
-        .child(text.to_string())
-        .into_any_element()
-}
-
-pub(crate) fn sidebar_section(
-    store: &Entity<RepoStore>,
-    id: EventId,
-    roots: fn(&RepoStore) -> &[Event],
-    top_gap: bool,
-    cx: &App,
-) -> AnyElement {
-    let store = store.read(cx);
-    let Some(root) = roots(store).iter().find(|event| event.id == id) else {
-        // The caller bails out when the root is missing.
-        return div().into_any_element();
-    };
-    let profile_store = ProfileStore::global(cx);
-
-    // Participants, the root author plus everyone who commented.
-    let mut participants: Vec<PublicKey> = vec![root.pubkey];
-    participants.extend(store.comments_of(&root.id).map(|comment| comment.pubkey));
-    participants.sort_by_key(PublicKey::to_hex);
-    participants.dedup();
-
-    // Labels are NIP-34 `t` hashtag tags on the event.
-    let labels: Vec<String> = root.tags.hashtags().map(|tag| tag.to_string()).collect();
-
-    v_flex()
-        .w(px(240.))
-        .h_full()
-        .flex_none()
-        .px_4()
-        .gap_4()
-        .border_l(px(1.))
-        .border_color(cx.theme().sidebar_border)
-        .child(
-            v_flex()
-                .when(top_gap, |this| this.mt_4())
-                .gap_2()
-                .child(sidebar_title("Participants", cx))
-                .children(participants.iter().map(|pubkey| {
-                    let profile = profile_store.read(cx).get(pubkey);
-                    let name = profile.name();
-                    let picture = profile.picture();
-
-                    h_flex()
-                        .gap_1()
-                        .items_center()
-                        .child(UserAvatar::new(name.clone()).picture(picture))
-                        .child(div().text_sm().truncate().text_ellipsis().child(name))
-                        .into_any_element()
-                })),
-        )
-        .child(
-            v_flex()
-                .gap_2()
-                .child(sidebar_title("Labels", cx))
-                .map(|this| {
-                    if labels.is_empty() {
-                        this.child(
-                            div()
-                                .text_sm()
-                                .text_color(cx.theme().muted_foreground)
-                                .child("None yet."),
-                        )
-                    } else {
-                        this.child(h_flex().gap_1().children({
-                            let mut items = vec![];
-
-                            for label in labels.iter() {
-                                items.push(
-                                    Tag::secondary()
-                                        .outline()
-                                        .xsmall()
-                                        .child(SharedString::from(label)),
-                                );
-                            }
-
-                            items
-                        }))
-                    }
-                }),
-        )
-        .into_any_element()
-}
-
-pub(crate) fn comments_section(store: &Entity<RepoStore>, root: EventId, cx: &App) -> AnyElement {
-    let store = store.read(cx);
-    let comments: Vec<&Event> = store.comments_of(&root).collect();
-    let title = SharedString::from(format!("Discussions {}", comments.len()));
-
-    v_flex()
-        .gap_4()
-        .child(div().text_xs().font_semibold().child(title))
-        .children(comments.iter().map(|comment| {
-            let profile = ProfileStore::global(cx).read(cx).get(&comment.pubkey);
-            let author = profile.name();
-            let picture = profile.picture();
-            let age = relative_time(comment.created_at);
-            let content = SharedString::from(comment.content.as_str());
-
-            v_flex()
-                .gap_1()
-                .p_3()
-                .border_1()
-                .border_color(cx.theme().border)
-                .rounded(cx.theme().radius)
-                .child(
-                    h_flex()
-                        .gap_2()
-                        .text_sm()
-                        .child(
-                            h_flex()
-                                .gap_1()
-                                .child(UserAvatar::new(author.clone()).picture(picture))
-                                .child(author),
-                        )
-                        .child(
-                            div()
-                                .text_color(cx.theme().muted_foreground)
-                                .child("commented"),
-                        )
-                        .child(
-                            div()
-                                .text_color(cx.theme().muted_foreground)
-                                .child(SharedString::from(age)),
-                        ),
-                )
-                .child(div().text_sm().child(content))
-        }))
-        .into_any_element()
-}
-
-/// `roots` selects the root's list within the store, issues or pull requests.
-pub(crate) fn comment_form(
-    store: &Entity<RepoStore>,
-    root: EventId,
-    roots: fn(&RepoStore) -> &[Event],
-    comment_input: &Entity<TextareaState>,
-    button_id: &'static str,
-    cx: &App,
-) -> AnyElement {
-    let comment_input = comment_input.clone();
-    let store = store.clone();
-
-    v_flex()
-        .gap_2()
-        .child(
-            Textarea::new(&comment_input)
-                .h_24()
-                .text_color(cx.theme().muted_foreground)
-                .bg(cx.theme().muted),
-        )
-        .child(
-            h_flex()
-                .justify_between()
-                .child(
-                    h_flex()
-                        .gap_1()
-                        .text_xs()
-                        .text_color(cx.theme().muted_foreground)
-                        .child(Icon::new(CustomIconName::Markdown).small())
-                        .child("Markdown is supported"),
-                )
-                .child(
-                    Button::new(button_id)
-                        .primary()
-                        .label("Comment")
-                        .tooltip("Post comment")
-                        .on_click(move |_event, window, cx| {
-                            let content = comment_input.read(cx).value().trim().to_string();
-                            if content.is_empty() {
-                                return;
-                            }
-                            let Some(root) = roots(store.read(cx))
-                                .iter()
-                                .find(|event| event.id == root)
-                                .cloned()
-                            else {
-                                return;
-                            };
-                            store.update(cx, |store, cx| {
-                                store.comment(&root, content, cx);
-                            });
-                            comment_input.update(cx, |input, cx| {
-                                input.set_value("", window, cx);
-                            });
-                        }),
-                ),
-        )
-        .into_any_element()
-}
-
-pub(crate) const COMMIT_ROW_HEIGHT: f32 = 56.;
-
-pub(crate) fn commit_row(
-    ix: usize,
-    commit: &FileCommit,
-    on_click: impl Fn(&mut Window, &mut App) + 'static,
-    cx: &App,
-) -> AnyElement {
-    h_flex()
-        .id(ix)
-        .px_4()
-        .h(px(COMMIT_ROW_HEIGHT))
-        .w_full()
-        .gap_3()
-        .items_center()
-        .border_b(px(1.))
-        .border_color(cx.theme().border)
-        .hover(|this| this.bg(cx.theme().list_hover))
-        .child(
-            v_flex()
-                .flex_1()
-                .min_w_0()
-                .gap_0p5()
-                .justify_center()
-                .child(
-                    h_flex()
-                        .gap_2()
-                        .items_center()
-                        .overflow_hidden()
-                        .child(
-                            div()
-                                .font_family(cx.theme().mono_font_family.clone())
-                                .text_xs()
-                                .text_color(cx.theme().muted_foreground)
-                                .child(commit.id.clone()),
-                        )
-                        .child(
-                            div()
-                                .flex_1()
-                                .min_w_0()
-                                .text_sm()
-                                .text_ellipsis()
-                                .whitespace_nowrap()
-                                .child(commit.summary.clone()),
-                        ),
-                )
-                .child(
-                    h_flex()
-                        .gap_2()
-                        .text_xs()
-                        .text_color(cx.theme().muted_foreground)
-                        .child(commit.author.clone())
-                        .child(relative_time_secs(commit.time)),
-                ),
-        )
-        .on_click(move |_event, window, cx| on_click(window, cx))
-        .into_any_element()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn builds_nested_tree_from_flat_entries() {
-        let entries = vec![
-            PathBuf::from("src"),
-            PathBuf::from("src/lib.rs"),
-            PathBuf::from("README.md"),
-            PathBuf::from("docs/guide.md"),
-        ];
-
-        let items = build_tree_items(&entries);
-
-        // Input order is preserved, dirs-first as produced by worktree_entries.
-        assert_eq!(items.len(), 3);
-        assert_eq!(items[0].label, "src");
-        assert_eq!(items[0].id, "src");
-        assert_eq!(items[0].children.len(), 1);
-        assert_eq!(items[0].children[0].label, "lib.rs");
-        assert_eq!(items[0].children[0].id, "src/lib.rs");
-
-        assert_eq!(items[1].label, "README.md");
-        assert_eq!(items[1].id, "README.md");
-
-        assert_eq!(items[2].label, "docs");
-        assert_eq!(items[2].children[0].label, "guide.md");
-        assert_eq!(items[2].children[0].id, "docs/guide.md");
-    }
-
-    #[test]
-    fn tree_builder_handles_deep_nesting() {
-        let entries = vec![
-            PathBuf::from("a"),
-            PathBuf::from("a/b"),
-            PathBuf::from("a/b/c.txt"),
-        ];
-
-        let items = build_tree_items(&entries);
-        assert_eq!(items.len(), 1);
-        assert_eq!(items[0].children[0].id, "a/b");
-        assert_eq!(items[0].children[0].children[0].id, "a/b/c.txt");
-    }
-
-    #[test]
-    fn tree_builder_merges_shared_prefixes() {
-        // File children of a directory arrive after other directories' entries.
-        // The worktree list is dirs-first globally.
-        // The shared prefix must still resolve to one node.
-        let entries = vec![
-            PathBuf::from("a/x.txt"),
-            PathBuf::from("b/y.txt"),
-            PathBuf::from("a/z.txt"),
-        ];
-
-        let items = build_tree_items(&entries);
-        assert_eq!(items.len(), 2);
-        assert_eq!(items[0].label, "a");
-        assert_eq!(items[0].children.len(), 2);
-        assert_eq!(items[1].label, "b");
-    }
-}

crates/workspace/src/views/repo/history.rs

@@ -11,8 +11,7 @@ use gpui_component::{ActiveTheme, Sizable, v_flex, v_virtual_list};
 use signed_ui::placeholder;
 
 use super::RepoDetailView;
-use crate::views::commit_diff::CommitDiffView;
-use crate::views::repo::helpers::{COMMIT_ROW_HEIGHT, commit_row};
+use crate::views::commit_diff::{COMMIT_ROW_HEIGHT, CommitDiffView, commit_row};
 
 impl RepoDetailView {
     pub(super) fn render_commits_tab(&self, cx: &mut Context<Self>) -> AnyElement {

crates/workspace/src/views/repo/loading.rs

@@ -11,9 +11,7 @@ use signed_git::FileCommit;
 use signed_state::GitStore;
 
 use super::RepoDetailView;
-use crate::views::repo::helpers::{
-    TreeItemSeed, build_tree_items, sorted_worktree_paths, tree_items,
-};
+use crate::views::tree::{TreeItemSeed, build_tree_items, sorted_worktree_paths, tree_items};
 
 struct RepoData {
     tree: Vec<TreeItemSeed>,

crates/workspace/src/views/repo/mod.rs

@@ -22,7 +22,6 @@ mod actions;
 mod banners;
 mod files;
 mod header;
-pub(super) mod helpers;
 mod history;
 mod init_dialog;
 mod loading;

crates/workspace/src/views/repo/refs.rs

@@ -7,7 +7,7 @@ use gpui_component::combobox::ComboboxState;
 use gpui_component::searchable_list::SearchableVec;
 
 use super::{RefKind, RepoDetailView};
-use crate::views::repo::helpers::{build_tree_items, sorted_worktree_paths, tree_items};
+use crate::views::tree::{build_tree_items, sorted_worktree_paths, tree_items};
 
 impl RepoDetailView {
     pub(super) fn switch_ref(

crates/workspace/src/views/tree.rs

@@ -0,0 +1,153 @@
+use std::collections::HashMap;
+use std::path::PathBuf;
+
+use gpui_component::tree::TreeItem;
+
+pub(crate) struct TreeItemSeed {
+    /// Path of the node, relative to the worktree root.
+    pub(crate) id: String,
+    pub(crate) label: String,
+    pub(crate) children: Vec<TreeItemSeed>,
+}
+
+pub(crate) fn tree_items(seeds: Vec<TreeItemSeed>, expand_folders: bool) -> Vec<TreeItem> {
+    fn convert(seed: TreeItemSeed, expand_folders: bool) -> TreeItem {
+        let mut item = TreeItem::new(seed.id, seed.label);
+        if expand_folders && !seed.children.is_empty() {
+            item = item.expanded(true);
+        }
+        item.children = seed
+            .children
+            .into_iter()
+            .map(|seed| convert(seed, expand_folders))
+            .collect();
+        item
+    }
+
+    seeds
+        .into_iter()
+        .map(|seed| convert(seed, expand_folders))
+        .collect()
+}
+
+/// Build nested tree items from a flat entry list sorted dirs-first.
+pub(crate) fn build_tree_items(entries: &[PathBuf]) -> Vec<TreeItemSeed> {
+    // Node indices by full path, so parents resolve in constant time while inserting.
+    let mut index: HashMap<String, usize> = HashMap::new();
+    let mut nodes: Vec<(String, String, Vec<usize>)> = Vec::new();
+    let mut roots: Vec<usize> = Vec::new();
+
+    for entry in entries {
+        let mut parent: Option<usize> = None;
+        let mut path = String::new();
+        for part in entry.components() {
+            let label = part.as_os_str().to_string_lossy().into_owned();
+            path = if path.is_empty() {
+                label.clone()
+            } else {
+                format!("{path}/{label}")
+            };
+            let ix = *index.entry(path.clone()).or_insert_with(|| {
+                let ix = nodes.len();
+                nodes.push((path.clone(), label.clone(), Vec::new()));
+                match parent {
+                    Some(parent) => nodes[parent].2.push(ix),
+                    None => roots.push(ix),
+                }
+                ix
+            });
+            parent = Some(ix);
+        }
+    }
+
+    fn assemble(ix: usize, nodes: &[(String, String, Vec<usize>)]) -> TreeItemSeed {
+        let (id, label, children) = &nodes[ix];
+        TreeItemSeed {
+            id: id.clone(),
+            label: label.clone(),
+            children: children
+                .iter()
+                .map(|child| assemble(*child, nodes))
+                .collect(),
+        }
+    }
+
+    roots.iter().map(|root| assemble(*root, &nodes)).collect()
+}
+
+/// Sorted relative paths of a worktree snapshot.
+///
+/// Compared against the `worktree_paths` of a repository panel to skip
+/// rebuilding the explorer when a refresh left the worktree unchanged.
+pub(crate) fn sorted_worktree_paths(entries: &[PathBuf]) -> Vec<String> {
+    let mut paths: Vec<String> = entries
+        .iter()
+        .map(|path| path.to_string_lossy().into_owned())
+        .collect();
+    paths.sort();
+    paths
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn builds_nested_tree_from_flat_entries() {
+        let entries = vec![
+            PathBuf::from("src"),
+            PathBuf::from("src/lib.rs"),
+            PathBuf::from("README.md"),
+            PathBuf::from("docs/guide.md"),
+        ];
+
+        let items = build_tree_items(&entries);
+
+        // Input order is preserved, dirs-first as produced by worktree_entries.
+        assert_eq!(items.len(), 3);
+        assert_eq!(items[0].label, "src");
+        assert_eq!(items[0].id, "src");
+        assert_eq!(items[0].children.len(), 1);
+        assert_eq!(items[0].children[0].label, "lib.rs");
+        assert_eq!(items[0].children[0].id, "src/lib.rs");
+
+        assert_eq!(items[1].label, "README.md");
+        assert_eq!(items[1].id, "README.md");
+
+        assert_eq!(items[2].label, "docs");
+        assert_eq!(items[2].children[0].label, "guide.md");
+        assert_eq!(items[2].children[0].id, "docs/guide.md");
+    }
+
+    #[test]
+    fn tree_builder_handles_deep_nesting() {
+        let entries = vec![
+            PathBuf::from("a"),
+            PathBuf::from("a/b"),
+            PathBuf::from("a/b/c.txt"),
+        ];
+
+        let items = build_tree_items(&entries);
+        assert_eq!(items.len(), 1);
+        assert_eq!(items[0].children[0].id, "a/b");
+        assert_eq!(items[0].children[0].children[0].id, "a/b/c.txt");
+    }
+
+    #[test]
+    fn tree_builder_merges_shared_prefixes() {
+        // File children of a directory arrive after other directories' entries.
+        // The worktree list is dirs-first globally.
+        // The shared prefix must still resolve to one node.
+        let entries = vec![
+            PathBuf::from("a/x.txt"),
+            PathBuf::from("b/y.txt"),
+            PathBuf::from("a/z.txt"),
+        ];
+
+        let items = build_tree_items(&entries);
+        assert_eq!(items.len(), 2);
+        assert_eq!(items[0].label, "a");
+        assert_eq!(items[0].children.len(), 2);
+        assert_eq!(items[1].label, "b");
+    }
+}