Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

feat(switch): show picker preview loading placeholders as dim hints (#3253)

Maximilian Roos633953a7485f
diff --git a/src/commands/picker/items.rs b/src/commands/picker/items.rs
index 4b0cff5c1..fa3ce1562 100644
--- a/src/commands/picker/items.rs
+++ b/src/commands/picker/items.rs
@@ -14,7 +14,7 @@ use dashmap::DashMap;
use ratatui::text::{Line, Span};
use skim::prelude::*;
use worktrunk::git::Repository;
-use worktrunk::styling::{INFO_SYMBOL, visual_width};
+use worktrunk::styling::{HINT_SYMBOL, INFO_SYMBOL, visual_width};
use super::super::list::ci_status::{PrRef, PrStatus};
use super::super::list::model::ListItem;
@@ -854,7 +854,7 @@ impl WorktreeSkimItem {
let branch = self.item.branch_name();
match pr {
PrPreview::Loading => {
- cformat!("○ Fetching PR status for <bold>{branch}</>{reset}…\n")
+ cformat!("{HINT_SYMBOL} <dim>Fetching PR status for {branch}…</>\n")
}
PrPreview::NoPr => {
cformat!("{INFO_SYMBOL}{reset} <bold>{branch}</>{reset} has no PR\n")
@@ -880,7 +880,7 @@ impl WorktreeSkimItem {
// The CI fetch hasn't reported yet — we don't know whether there's a
// PR to fetch comments for. Mirror the `pr` tab's loading state.
PrPreview::Loading => {
- cformat!("○ Fetching PR status for <bold>{branch}</>{reset}…\n")
+ cformat!("{HINT_SYMBOL} <dim>Fetching PR status for {branch}…</>\n")
}
PrPreview::NoPr => {
cformat!("{INFO_SYMBOL}{reset} <bold>{branch}</>{reset} has no PR\n")
@@ -938,7 +938,7 @@ impl WorktreeSkimItem {
unreachable!("comments tab renders via render_comments_pane")
}
};
- format!("○ {verb} {label}…\n")
+ cformat!("{HINT_SYMBOL} <dim>{verb} {label}…</>\n")
}
/// Compute preview and apply pager for diff modes. Returns the
diff --git a/src/commands/picker/prs.rs b/src/commands/picker/prs.rs
index 10e1c213e..d41549cf2 100644
--- a/src/commands/picker/prs.rs
+++ b/src/commands/picker/prs.rs
@@ -50,7 +50,7 @@ use serde::Deserialize;
use skim::prelude::*;
use unicode_width::UnicodeWidthStr;
use worktrunk::git::{CiPlatform, Repository};
-use worktrunk::styling::{INFO_SYMBOL, StyledLine, WARNING_SYMBOL, warning_message};
+use worktrunk::styling::{HINT_SYMBOL, INFO_SYMBOL, StyledLine, WARNING_SYMBOL, warning_message};
use super::super::list::ci_status::{
CiSource, CiStatus, GitHubPrInfo, PrRef, PrStatus, ReviewState, non_interactive_cmd,
@@ -833,20 +833,19 @@ fn pr_row_empty_placeholder() -> String {
/// [`super::items::WorktreeSkimItem::render_comments_pane`]) so both row types
/// show the identical in-flight pane.
pub(super) fn pr_deferred_loading(mode: PreviewMode) -> String {
- let reset = Reset;
let label = match mode {
PreviewMode::Log => "commit log",
PreviewMode::Comments => "comments",
// Only the deferred tabs reach here; other modes render synchronously.
_ => "preview",
};
- cformat!("{INFO_SYMBOL}{reset} Loading {label}…\n")
+ cformat!("{HINT_SYMBOL} <dim>Loading {label}…</>\n")
}
/// Terminal pane for a `--prs` deferred tab whose background fetch failed (forge
/// CLI missing/unauthenticated, network error, unparsable JSON). The deferred
/// closures cache this in place of an empty slot, so the tab shows a clear
-/// "couldn't load" rather than [`pr_deferred_loading`]'s spinner forever: the
+/// "couldn't load" rather than [`pr_deferred_loading`]'s placeholder forever: the
/// fetch is spawned once per row and never retried in-session (see
/// [`spawn_pr_previews`]), so a `None` left uncached would strand the tab on
/// "Loading…". The warning glyph distinguishes it from the benign info states
diff --git a/src/commands/picker/snapshots/wt__commands__picker__items__tests__cache_miss.snap b/src/commands/picker/snapshots/wt__commands__picker__items__tests__cache_miss.snap
index 807e87907..2df3e510d 100644
--- a/src/commands/picker/snapshots/wt__commands__picker__items__tests__cache_miss.snap
+++ b/src/commands/picker/snapshots/wt__commands__picker__items__tests__cache_miss.snap
@@ -2,4 +2,4 @@
source: src/commands/picker/items.rs
expression: "cache_miss.preview_for_mode(PreviewMode::Summary, 80, 40)"
---
-○ Generating summary…
+↳ Generating summary…
diff --git a/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_branch_diff.snap b/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_branch_diff.snap
index 34c91b1c9..c38eff975 100644
--- a/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_branch_diff.snap
+++ b/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_branch_diff.snap
@@ -2,4 +2,4 @@
source: src/commands/picker/items.rs
expression: "WorktreeSkimItem::loading_placeholder(mode)"
---
-○ Loading branch diff…
+↳ Loading branch diff…
diff --git a/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_log.snap b/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_log.snap
index 78ed396d5..3b1cda53d 100644
--- a/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_log.snap
+++ b/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_log.snap
@@ -2,4 +2,4 @@
source: src/commands/picker/items.rs
expression: "WorktreeSkimItem::loading_placeholder(mode)"
---
-○ Loading log…
+↳ Loading log…
diff --git a/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_summary.snap b/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_summary.snap
index 16ccca393..016155edd 100644
--- a/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_summary.snap
+++ b/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_summary.snap
@@ -2,4 +2,4 @@
source: src/commands/picker/items.rs
expression: "WorktreeSkimItem::loading_placeholder(mode)"
---
-○ Generating summary…
+↳ Generating summary…
diff --git a/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_upstream_diff.snap b/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_upstream_diff.snap
index c9cdf5abc..0986bbf38 100644
--- a/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_upstream_diff.snap
+++ b/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_upstream_diff.snap
@@ -2,4 +2,4 @@
source: src/commands/picker/items.rs
expression: "WorktreeSkimItem::loading_placeholder(mode)"
---
-○ Loading upstream diff…
+↳ Loading upstream diff…
diff --git a/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_working_tree.snap b/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_working_tree.snap
index ff593a5e1..c256cf357 100644
--- a/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_working_tree.snap
+++ b/src/commands/picker/snapshots/wt__commands__picker__items__tests__loading_placeholder_working_tree.snap
@@ -2,4 +2,4 @@
source: src/commands/picker/items.rs
expression: "WorktreeSkimItem::loading_placeholder(mode)"
---
-○ Loading working-tree diff…
+↳ Loading working-tree diff…