Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/git.rs
Original file line number Diff line number Diff line change
Expand Up @@ -331,8 +331,8 @@ pub fn remove_worktree(repo: &Path, path: &Path, force: bool) -> Result<()> {
/// * `"↑N"` / `"↓N"` / `"↑N ↓N"` — clean but out of sync,
/// * `"idle"` — clean and in sync with upstream,
/// * `""` — no upstream and not dirty (the C# build still
/// shows "idle"; we hide the label so a brand-new
/// standalone branch doesn't claim sync state).
/// shows "idle"; we hide the label so a brand-new standalone
/// branch doesn't claim sync state).
pub fn worktree_status_label(status: &GitStatus) -> String {
worktree_status_label_with_ci(status, crate::pr::CiStatus::None)
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/theme/builtin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ mod tests {
//! * `Fig.Color.Ink` = `#FFFFFFFF`
//! * `Fig.Color.InkMuted` = `#FFA6A6A6`
//! * `Fig.Color.Divider` = `#22FFFFFF` (alpha-blended white over
//! `Canvas` flattens to ≈ `#222222`)
//! `Canvas` flattens to ≈ `#222222`)
//! * `Framer.Color.Blue` = `#FF0099FF`
//!
//! Any accidental drift in these values silently shifts the chrome
Expand Down
15 changes: 7 additions & 8 deletions src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5521,9 +5521,9 @@ impl AppShell {
///
/// Cap-eviction respects persistence: a flurry of regular toasts
/// won't drop the persistent one off the back. If we're still over
/// cap after removing all expirables (extremely unlikely — would mean
/// >TOAST_VISIBLE_CAP open action prompts at once) the oldest
/// persistent wins.
/// cap after removing all expirables (extremely unlikely — would
/// mean more than `TOAST_VISIBLE_CAP` open action prompts at once)
/// the oldest persistent wins.
pub(crate) fn push_action_toast(
&mut self,
kind: ToastKind,
Expand Down Expand Up @@ -7558,11 +7558,6 @@ impl AppShell {
}

impl AppShell {
/// Build one group's tab strip section + body pane. Returned as a
/// pair so `render` can interleave dividers between adjacent
/// groups while keeping the strip and the pane below it in the
/// same column.

/// Handle a left-press on any of the title-bar drag regions
/// (brand mark, strip-left padding, per-group trailing whitespace).
///
Expand Down Expand Up @@ -7678,6 +7673,10 @@ impl AppShell {
window.start_window_move();
}

/// Build one group's tab strip section + body pane. Returned as a
/// pair so `render` can interleave dividers between adjacent
/// groups while keeping the strip and the pane below it in the
/// same column.
fn render_group(
&self,
theme: &Arc<Theme>,
Expand Down
4 changes: 2 additions & 2 deletions src/command_palette.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
//! - **Projects** — focus / select the project in the sidebar.
//! - **Worktrees** — open or focus its session.
//! - **Agents** — start a new session running that agent in the
//! active worktree.
//! active worktree.
//! - **Themes** — live-apply (writes `settings.theme`, re-renders chrome).
//! - **Commands** — static built-ins (toggle overview / sidebar, new
//! project, open settings, reload theme).
//! project, open settings, reload theme).
//!
//! Arrow keys move selection; Enter activates the highlighted row;
//! Esc closes. The dropdown is grouped by kind so the user can
Expand Down
4 changes: 2 additions & 2 deletions src/sidebar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -682,8 +682,8 @@ impl Sidebar {
}

/// Drive the caret blink for the sidebar-owned dialogs
/// ("Add project", "New worktree from branch"; rename + settings
/// + command palette live on AppShell with their own timer).
/// ("Add project", "New worktree from branch"; rename, settings
/// and command palette live on AppShell with their own timer).
/// Shares the [`crate::app::TEXT_BLINK_PERIOD`] cadence so paired
/// inputs across the two entities flip in lockstep — two timers
/// on the same ms-grid drift by at most one tick across a
Expand Down
4 changes: 2 additions & 2 deletions src/text_field.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
//! This module owns the data side (a small editable buffer with a
//! caret index, char-boundary-safe) plus a custom gpui [`Element`]
//! that shapes the rendered line, paints the caret at
//! `ShapedLine::x_for_index(caret_byte)`, and caches the shaped line
//! + the painted bounds back onto the field so the parent's
//! `ShapedLine::x_for_index(caret_byte)`, and caches the shaped
//! line + the painted bounds back onto the field so the parent's
//! `on_mouse_down` listener can read them and translate a click
//! position into a byte index via `ShapedLine::closest_index_for_x`.
//!
Expand Down
4 changes: 2 additions & 2 deletions terminal/src/colors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ impl ColorPalette {
/// Themes shipped from the built-in registry always provide a full
/// 256-entry `extended` table. If a theme loaded from disk (or a
/// future hand-edited file) supplies fewer than 256 entries we
/// synthesize the missing slots with the standard xterm 6×6×6 cube
/// + 24-step grayscale ramp — the terminal renderer indexes
/// synthesize the missing slots with the standard xterm 6×6×6
/// cube + 24-step grayscale ramp — the terminal renderer indexes
/// straight into this table for `Color::Indexed`, so a partial
/// table would otherwise paint as black.
pub fn from_theme_palette(palette: &codescope_core::ThemePalette) -> Self {
Expand Down