From eedfcca30ee767d78ffae44d75bc7ec899714459 Mon Sep 17 00:00:00 2001 From: cpojer Date: Wed, 4 Mar 2026 18:04:59 +0900 Subject: [PATCH 1/2] chore: Styling changes to align with Vite+. --- .github/workflows/ci.yml | 3 +- Cargo.lock | 1 - crates/vite_select/Cargo.toml | 1 - crates/vite_select/src/interactive.rs | 84 ++++++++++++++++--- crates/vite_task/src/session/reporter/mod.rs | 2 +- .../task-list/snapshots/vp run in script.snap | 15 ++-- .../interactive long command truncated.snap | 50 +++++------ ...ve enter with no results does nothing.snap | 54 ++++++------ .../interactive escape clears query.snap | 58 ++++++------- .../interactive scroll long list.snap | 78 ++++++++--------- ...interactive search other package task.snap | 30 +++---- ...earch preserves rating within package.snap | 52 ++++++------ .../interactive search then select.snap | 32 +++---- ...active search with hash skips reorder.snap | 36 ++++---- .../interactive select task from lib.snap | 26 +++--- .../snapshots/interactive select task.snap | 52 ++++++------ .../interactive select with typo.snap | 6 +- .../verbose with typo enters selector.snap | 6 +- crates/vite_tui/src/config.rs | 4 +- justfile | 3 +- 20 files changed, 328 insertions(+), 265 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb194f29..67754e62 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -111,7 +111,8 @@ jobs: components: clippy rust-docs rustfmt - run: dprint check - - run: cargo shear + # cargo-shear currently misflags the `fspy_test_bin` artifact bindep in crates/fspy. + - run: cargo shear --exclude fspy - run: cargo fmt --check - run: RUSTDOCFLAGS='-D warnings' cargo doc --no-deps --document-private-items diff --git a/Cargo.lock b/Cargo.lock index 1a195bcf..d79cc2f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3831,7 +3831,6 @@ dependencies = [ "assert2", "crossterm", "nucleo-matcher", - "owo-colors", "vite_str", ] diff --git a/crates/vite_select/Cargo.toml b/crates/vite_select/Cargo.toml index bc859128..6a344ae0 100644 --- a/crates/vite_select/Cargo.toml +++ b/crates/vite_select/Cargo.toml @@ -14,7 +14,6 @@ workspace = true anyhow = { workspace = true } crossterm = { workspace = true } nucleo-matcher = { workspace = true } -owo-colors = { workspace = true } vite_str = { path = "../vite_str" } [dev-dependencies] diff --git a/crates/vite_select/src/interactive.rs b/crates/vite_select/src/interactive.rs index 33cc6f41..1c063706 100644 --- a/crates/vite_select/src/interactive.rs +++ b/crates/vite_select/src/interactive.rs @@ -3,10 +3,9 @@ use std::io::{Write, stdout}; use crossterm::{ cursor::{self, MoveToColumn}, event::{self, Event, KeyCode, KeyEvent, KeyEventKind, KeyModifiers}, - style::{Attribute, SetAttribute}, + style::{Attribute, Color, ResetColor, SetAttribute, SetForegroundColor}, terminal::{self, Clear, ClearType}, }; -use owo_colors::{OwoColorize, Stream}; use crate::{RenderState, SelectItem, fuzzy::fuzzy_match}; @@ -144,21 +143,21 @@ pub fn render_items(writer: &mut impl Write, params: &RenderParams<'_>) -> anyho lines += 1; } + let is_interactive = query.is_some(); + // Prompt line (interactive only) if let Some(q) = query { - let bold = SetAttribute(Attribute::Bold); - let reset = SetAttribute(Attribute::Reset); // Print ": " separator before query only when query is non-empty, // to avoid a trailing space that Windows ConPTY would strip. if q.is_empty() { write!( writer, - "{bold}Search task{reset} (\u{2191}/\u{2193} to move, enter to select):{line_ending}", + "Select a task (\u{2191}/\u{2193}, Enter to run, Esc to clear):{line_ending}", )?; } else { write!( writer, - "{bold}Search task{reset} (\u{2191}/\u{2193} to move, enter to select): {q}{line_ending}", + "Select a task (\u{2191}/\u{2193}, Enter to run, Esc to clear): {q}{line_ending}", )?; } lines += 1; @@ -171,8 +170,12 @@ pub fn render_items(writer: &mut impl Write, params: &RenderParams<'_>) -> anyho let is_selected = *selected_in_filtered == Some(vi); // Truncate description to prevent line wrapping. - // Line layout: prefix (2: "> " or " ") + label + ": " (2) + description - let prefix_and_label_width = 2 + item.label.chars().count() + 2; + // Line layout: + // - interactive prefix is " › " or " " (4 chars) + // - non-interactive prefix is " " (2 chars) + // then label + ": " + description + let prefix_width = if is_interactive { 4 } else { 2 }; + let prefix_and_label_width = prefix_width + item.label.chars().count() + 2; let max_desc_chars = params.max_line_width.saturating_sub(prefix_and_label_width); let desc_str = item.description.as_str(); let desc_char_count = desc_str.chars().count(); @@ -186,18 +189,37 @@ pub fn render_items(writer: &mut impl Write, params: &RenderParams<'_>) -> anyho } else { desc_str }; - let desc = display_desc.if_supports_color(Stream::Stdout, |s| s.cyan()); - if is_selected { + if is_selected && is_interactive { + write!( + writer, + "{blue}{bold} \u{203a} {label}: {desc}{reset}{line_ending}", + blue = SetForegroundColor(Color::Blue), + bold = SetAttribute(Attribute::Bold), + label = item.label, + desc = display_desc, + reset = SetAttribute(Attribute::Reset), + )?; + } else if is_interactive { + write!( + writer, + "{marker_color} {reset_color}{}:{command_color} {display_desc}{reset_color}{line_ending}", + item.label, + marker_color = SetForegroundColor(Color::DarkGrey), + command_color = SetForegroundColor(Color::Grey), + reset_color = ResetColor, + )?; + } else if is_selected { write!( writer, "{bold}> {label}: {desc}{reset}{line_ending}", bold = SetAttribute(Attribute::Bold), label = item.label, + desc = display_desc, reset = SetAttribute(Attribute::Reset), )?; } else { - write!(writer, " {}: {desc}{line_ending}", item.label)?; + write!(writer, " {}: {display_desc}{line_ending}", item.label)?; } lines += 1; } @@ -401,6 +423,33 @@ mod tests { strip_ansi(&String::from_utf8(buf).unwrap()) } + #[expect(clippy::disallowed_types, reason = "test helper building arbitrary output string")] + fn render_interactive_to_string( + items: &[SelectItem], + query: &str, + max_line_width: usize, + ) -> String { + let filtered: Vec = (0..items.len()).collect(); + let len = filtered.len(); + let mut buf = Vec::new(); + render_items( + &mut buf, + &RenderParams { + items, + filtered: &filtered, + selected_in_filtered: Some(0), + visible_range: 0..len, + hidden_count: 0, + header: None, + query: Some(query), + line_ending: "\n", + max_line_width, + }, + ) + .unwrap(); + strip_ansi(&String::from_utf8(buf).unwrap()) + } + #[test] fn truncates_long_description() { let items = make_items(&[("build", "a]really long command that exceeds the width limit")]); @@ -463,4 +512,17 @@ mod tests { let line = output.lines().next().unwrap(); assert!(line.contains("my-task"), "label should always be preserved: {line:?}"); } + + #[test] + fn interactive_style_matches_vp_selector_marker_and_indent() { + let items = make_items(&[("build", "echo build"), ("lint", "echo lint")]); + let output = render_interactive_to_string(&items, "", 80); + let mut lines = output.lines(); + let prompt = lines.next().unwrap(); + let selected = lines.next().unwrap(); + let unselected = lines.next().unwrap(); + assert_eq!(prompt, "Select a task (↑/↓, Enter to run, Esc to clear):"); + assert_eq!(selected, " › build: echo build"); + assert_eq!(unselected, " lint: echo lint"); + } } diff --git a/crates/vite_task/src/session/reporter/mod.rs b/crates/vite_task/src/session/reporter/mod.rs index 58c4ed63..103fef47 100644 --- a/crates/vite_task/src/session/reporter/mod.rs +++ b/crates/vite_task/src/session/reporter/mod.rs @@ -194,7 +194,7 @@ impl ColorizeExt for T { } } -const COMMAND_STYLE: Style = Style::new().cyan(); +const COMMAND_STYLE: Style = Style::new().blue(); const CACHE_MISS_STYLE: Style = Style::new().purple(); /// Format the display's cwd as a string relative to the workspace root. diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-list/snapshots/vp run in script.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-list/snapshots/vp run in script.snap index 15546912..6cb8f51d 100644 --- a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-list/snapshots/vp run in script.snap +++ b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-list/snapshots/vp run in script.snap @@ -1,17 +1,18 @@ --- source: crates/vite_task_bin/tests/e2e_snapshots/main.rs +assertion_line: 460 expression: e2e_outputs --- > vp run list-tasks @ expect-milestone: task-select::0 $ vp run ⊘ cache disabled -Search task (↑/↓ to move, enter to select): -> hello: echo hello from root - list-tasks: vp run - app#build: echo build app - app#lint: echo lint app - app#test: echo test app - lib#build: echo build lib +Select a task (↑/↓, Enter to run, Esc to clear): + › hello: echo hello from root + list-tasks: vp run + app#build: echo build app + app#lint: echo lint app + app#test: echo test app + lib#build: echo build lib @ write-key: enter $ vp run ⊘ cache disabled Selected task: hello diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select-truncate/snapshots/interactive long command truncated.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select-truncate/snapshots/interactive long command truncated.snap index f1bd1d22..e5a67051 100644 --- a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select-truncate/snapshots/interactive long command truncated.snap +++ b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select-truncate/snapshots/interactive long command truncated.snap @@ -6,39 +6,39 @@ info: --- > vp run @ expect-milestone: task-select::0 -Search task (↑/↓ to move, enter to select): -> build: echo build app - lint: echo lint app - long-cmd: echo aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa… - test: echo test app +Select a task (↑/↓, Enter to run, Esc to clear): + › build: echo build app + lint: echo lint app + long-cmd: echo aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa… + test: echo test app @ write-key: down @ expect-milestone: task-select::1 -Search task (↑/↓ to move, enter to select): - build: echo build app -> lint: echo lint app - long-cmd: echo aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa… - test: echo test app +Select a task (↑/↓, Enter to run, Esc to clear): + build: echo build app + › lint: echo lint app + long-cmd: echo aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa… + test: echo test app @ write-key: down @ expect-milestone: task-select::2 -Search task (↑/↓ to move, enter to select): - build: echo build app - lint: echo lint app -> long-cmd: echo aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa… - test: echo test app +Select a task (↑/↓, Enter to run, Esc to clear): + build: echo build app + lint: echo lint app + › long-cmd: echo aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa… + test: echo test app @ write-key: down @ expect-milestone: task-select::3 -Search task (↑/↓ to move, enter to select): - build: echo build app - lint: echo lint app - long-cmd: echo aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa… -> test: echo test app +Select a task (↑/↓, Enter to run, Esc to clear): + build: echo build app + lint: echo lint app + long-cmd: echo aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa… + › test: echo test app @ write-key: up @ expect-milestone: task-select::2 -Search task (↑/↓ to move, enter to select): - build: echo build app - lint: echo lint app -> long-cmd: echo aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa… - test: echo test app +Select a task (↑/↓, Enter to run, Esc to clear): + build: echo build app + lint: echo lint app + › long-cmd: echo aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa… + test: echo test app @ write-key: enter Selected task: long-cmd ~/packages/app$ echo aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ⊘ cache disabled diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive enter with no results does nothing.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive enter with no results does nothing.snap index 63568d19..f351b4f3 100644 --- a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive enter with no results does nothing.snap +++ b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive enter with no results does nothing.snap @@ -6,40 +6,40 @@ info: --- > vp run @ expect-milestone: task-select::0 -Search task (↑/↓ to move, enter to select): -> build: echo build app - lint: echo lint app - test: echo test app - lib#build: echo build lib - lib#lint: echo lint lib - lib#test: echo test lib - lib#typecheck: echo typecheck lib - task-select-test#check: echo check root - task-select-test#clean: echo clean root - task-select-test#deploy: echo deploy root - task-select-test#docs: echo docs root - task-select-test#format: echo format root +Select a task (↑/↓, Enter to run, Esc to clear): + › build: echo build app + lint: echo lint app + test: echo test app + lib#build: echo build lib + lib#lint: echo lint lib + lib#test: echo test lib + lib#typecheck: echo typecheck lib + task-select-test#check: echo check root + task-select-test#clean: echo clean root + task-select-test#deploy: echo deploy root + task-select-test#docs: echo docs root + task-select-test#format: echo format root (…3 more) @ write: zzzzz @ expect-milestone: task-select:zzzzz:0 -Search task (↑/↓ to move, enter to select): zzzzz +Select a task (↑/↓, Enter to run, Esc to clear): zzzzz No matching tasks. @ write-key: enter @ write-key: escape @ expect-milestone: task-select::0 -Search task (↑/↓ to move, enter to select): -> build: echo build app - lint: echo lint app - test: echo test app - lib#build: echo build lib - lib#lint: echo lint lib - lib#test: echo test lib - lib#typecheck: echo typecheck lib - task-select-test#check: echo check root - task-select-test#clean: echo clean root - task-select-test#deploy: echo deploy root - task-select-test#docs: echo docs root - task-select-test#format: echo format root +Select a task (↑/↓, Enter to run, Esc to clear): + › build: echo build app + lint: echo lint app + test: echo test app + lib#build: echo build lib + lib#lint: echo lint lib + lib#test: echo test lib + lib#typecheck: echo typecheck lib + task-select-test#check: echo check root + task-select-test#clean: echo clean root + task-select-test#deploy: echo deploy root + task-select-test#docs: echo docs root + task-select-test#format: echo format root (…3 more) @ write-key: enter Selected task: build diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive escape clears query.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive escape clears query.snap index 14e49503..cfa44e3b 100644 --- a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive escape clears query.snap +++ b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive escape clears query.snap @@ -6,40 +6,40 @@ info: --- > vp run @ expect-milestone: task-select::0 -Search task (↑/↓ to move, enter to select): -> build: echo build app - lint: echo lint app - test: echo test app - lib#build: echo build lib - lib#lint: echo lint lib - lib#test: echo test lib - lib#typecheck: echo typecheck lib - task-select-test#check: echo check root - task-select-test#clean: echo clean root - task-select-test#deploy: echo deploy root - task-select-test#docs: echo docs root - task-select-test#format: echo format root +Select a task (↑/↓, Enter to run, Esc to clear): + › build: echo build app + lint: echo lint app + test: echo test app + lib#build: echo build lib + lib#lint: echo lint lib + lib#test: echo test lib + lib#typecheck: echo typecheck lib + task-select-test#check: echo check root + task-select-test#clean: echo clean root + task-select-test#deploy: echo deploy root + task-select-test#docs: echo docs root + task-select-test#format: echo format root (…3 more) @ write: lin @ expect-milestone: task-select:lin:0 -Search task (↑/↓ to move, enter to select): lin -> lint: echo lint app - lib#lint: echo lint lib +Select a task (↑/↓, Enter to run, Esc to clear): lin + › lint: echo lint app + lib#lint: echo lint lib @ write-key: escape @ expect-milestone: task-select::0 -Search task (↑/↓ to move, enter to select): -> build: echo build app - lint: echo lint app - test: echo test app - lib#build: echo build lib - lib#lint: echo lint lib - lib#test: echo test lib - lib#typecheck: echo typecheck lib - task-select-test#check: echo check root - task-select-test#clean: echo clean root - task-select-test#deploy: echo deploy root - task-select-test#docs: echo docs root - task-select-test#format: echo format root +Select a task (↑/↓, Enter to run, Esc to clear): + › build: echo build app + lint: echo lint app + test: echo test app + lib#build: echo build lib + lib#lint: echo lint lib + lib#test: echo test lib + lib#typecheck: echo typecheck lib + task-select-test#check: echo check root + task-select-test#clean: echo clean root + task-select-test#deploy: echo deploy root + task-select-test#docs: echo docs root + task-select-test#format: echo format root (…3 more) @ write-key: enter Selected task: build diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive scroll long list.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive scroll long list.snap index ee81188a..a009030e 100644 --- a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive scroll long list.snap +++ b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive scroll long list.snap @@ -6,19 +6,19 @@ info: --- > vp run @ expect-milestone: task-select::0 -Search task (↑/↓ to move, enter to select): -> build: echo build app - lint: echo lint app - test: echo test app - lib#build: echo build lib - lib#lint: echo lint lib - lib#test: echo test lib - lib#typecheck: echo typecheck lib - task-select-test#check: echo check root - task-select-test#clean: echo clean root - task-select-test#deploy: echo deploy root - task-select-test#docs: echo docs root - task-select-test#format: echo format root +Select a task (↑/↓, Enter to run, Esc to clear): + › build: echo build app + lint: echo lint app + test: echo test app + lib#build: echo build lib + lib#lint: echo lint lib + lib#test: echo test lib + lib#typecheck: echo typecheck lib + task-select-test#check: echo check root + task-select-test#clean: echo clean root + task-select-test#deploy: echo deploy root + task-select-test#docs: echo docs root + task-select-test#format: echo format root (…3 more) @ write-key: down @ write-key: down @@ -29,19 +29,19 @@ Search task (↑/↓ to move, enter to select): @ write-key: down @ write-key: down @ expect-milestone: task-select::8 -Search task (↑/↓ to move, enter to select): - build: echo build app - lint: echo lint app - test: echo test app - lib#build: echo build lib - lib#lint: echo lint lib - lib#test: echo test lib - lib#typecheck: echo typecheck lib - task-select-test#check: echo check root -> task-select-test#clean: echo clean root - task-select-test#deploy: echo deploy root - task-select-test#docs: echo docs root - task-select-test#format: echo format root +Select a task (↑/↓, Enter to run, Esc to clear): + build: echo build app + lint: echo lint app + test: echo test app + lib#build: echo build lib + lib#lint: echo lint lib + lib#test: echo test lib + lib#typecheck: echo typecheck lib + task-select-test#check: echo check root + › task-select-test#clean: echo clean root + task-select-test#deploy: echo deploy root + task-select-test#docs: echo docs root + task-select-test#format: echo format root (…3 more) @ write-key: up @ write-key: up @@ -52,19 +52,19 @@ Search task (↑/↓ to move, enter to select): @ write-key: up @ write-key: up @ expect-milestone: task-select::0 -Search task (↑/↓ to move, enter to select): -> build: echo build app - lint: echo lint app - test: echo test app - lib#build: echo build lib - lib#lint: echo lint lib - lib#test: echo test lib - lib#typecheck: echo typecheck lib - task-select-test#check: echo check root - task-select-test#clean: echo clean root - task-select-test#deploy: echo deploy root - task-select-test#docs: echo docs root - task-select-test#format: echo format root +Select a task (↑/↓, Enter to run, Esc to clear): + › build: echo build app + lint: echo lint app + test: echo test app + lib#build: echo build lib + lib#lint: echo lint lib + lib#test: echo test lib + lib#typecheck: echo typecheck lib + task-select-test#check: echo check root + task-select-test#clean: echo clean root + task-select-test#deploy: echo deploy root + task-select-test#docs: echo docs root + task-select-test#format: echo format root (…3 more) @ write-key: enter Selected task: build diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive search other package task.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive search other package task.snap index 65655cc3..85bfd0f7 100644 --- a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive search other package task.snap +++ b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive search other package task.snap @@ -6,24 +6,24 @@ info: --- > vp run @ expect-milestone: task-select::0 -Search task (↑/↓ to move, enter to select): -> build: echo build app - lint: echo lint app - test: echo test app - lib#build: echo build lib - lib#lint: echo lint lib - lib#test: echo test lib - lib#typecheck: echo typecheck lib - task-select-test#check: echo check root - task-select-test#clean: echo clean root - task-select-test#deploy: echo deploy root - task-select-test#docs: echo docs root - task-select-test#format: echo format root +Select a task (↑/↓, Enter to run, Esc to clear): + › build: echo build app + lint: echo lint app + test: echo test app + lib#build: echo build lib + lib#lint: echo lint lib + lib#test: echo test lib + lib#typecheck: echo typecheck lib + task-select-test#check: echo check root + task-select-test#clean: echo clean root + task-select-test#deploy: echo deploy root + task-select-test#docs: echo docs root + task-select-test#format: echo format root (…3 more) @ write: typec @ expect-milestone: task-select:typec:0 -Search task (↑/↓ to move, enter to select): typec -> lib#typecheck: echo typecheck lib +Select a task (↑/↓, Enter to run, Esc to clear): typec + › lib#typecheck: echo typecheck lib @ write-key: enter Selected task: lib#typecheck ~/packages/lib$ echo typecheck lib ⊘ cache disabled diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive search preserves rating within package.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive search preserves rating within package.snap index 71c5a7b7..4bb84dd4 100644 --- a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive search preserves rating within package.snap +++ b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive search preserves rating within package.snap @@ -6,35 +6,35 @@ info: --- > vp run @ expect-milestone: task-select::0 -Search task (↑/↓ to move, enter to select): -> build: echo build lib - lint: echo lint lib - test: echo test lib - typecheck: echo typecheck lib - app#build: echo build app - app#lint: echo lint app - app#test: echo test app - task-select-test#check: echo check root - task-select-test#clean: echo clean root - task-select-test#deploy: echo deploy root - task-select-test#docs: echo docs root - task-select-test#format: echo format root +Select a task (↑/↓, Enter to run, Esc to clear): + › build: echo build lib + lint: echo lint lib + test: echo test lib + typecheck: echo typecheck lib + app#build: echo build app + app#lint: echo lint app + app#test: echo test app + task-select-test#check: echo check root + task-select-test#clean: echo clean root + task-select-test#deploy: echo deploy root + task-select-test#docs: echo docs root + task-select-test#format: echo format root (…3 more) @ write: t @ expect-milestone: task-select:t:0 -Search task (↑/↓ to move, enter to select): t -> test: echo test lib - typecheck: echo typecheck lib - lint: echo lint lib - task-select-test#check: echo check root - task-select-test#clean: echo clean root - task-select-test#deploy: echo deploy root - task-select-test#docs: echo docs root - task-select-test#format: echo format root - task-select-test#hello: echo hello from root - task-select-test#run-typo-task: vp run nonexistent-xyz - task-select-test#validate: echo validate root - app#test: echo test app +Select a task (↑/↓, Enter to run, Esc to clear): t + › test: echo test lib + typecheck: echo typecheck lib + lint: echo lint lib + task-select-test#check: echo check root + task-select-test#clean: echo clean root + task-select-test#deploy: echo deploy root + task-select-test#docs: echo docs root + task-select-test#format: echo format root + task-select-test#hello: echo hello from root + task-select-test#run-typo-task: vp run nonexistent-xyz + task-select-test#validate: echo validate root + app#test: echo test app (…1 more) @ write-key: enter Selected task: test diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive search then select.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive search then select.snap index fd4dc098..e8fce7b1 100644 --- a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive search then select.snap +++ b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive search then select.snap @@ -6,25 +6,25 @@ info: --- > vp run @ expect-milestone: task-select::0 -Search task (↑/↓ to move, enter to select): -> build: echo build app - lint: echo lint app - test: echo test app - lib#build: echo build lib - lib#lint: echo lint lib - lib#test: echo test lib - lib#typecheck: echo typecheck lib - task-select-test#check: echo check root - task-select-test#clean: echo clean root - task-select-test#deploy: echo deploy root - task-select-test#docs: echo docs root - task-select-test#format: echo format root +Select a task (↑/↓, Enter to run, Esc to clear): + › build: echo build app + lint: echo lint app + test: echo test app + lib#build: echo build lib + lib#lint: echo lint lib + lib#test: echo test lib + lib#typecheck: echo typecheck lib + task-select-test#check: echo check root + task-select-test#clean: echo clean root + task-select-test#deploy: echo deploy root + task-select-test#docs: echo docs root + task-select-test#format: echo format root (…3 more) @ write: lin @ expect-milestone: task-select:lin:0 -Search task (↑/↓ to move, enter to select): lin -> lint: echo lint app - lib#lint: echo lint lib +Select a task (↑/↓, Enter to run, Esc to clear): lin + › lint: echo lint app + lib#lint: echo lint lib @ write-key: enter Selected task: lint ~/packages/app$ echo lint app ⊘ cache disabled diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive search with hash skips reorder.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive search with hash skips reorder.snap index d9e0f83b..873e1cae 100644 --- a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive search with hash skips reorder.snap +++ b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive search with hash skips reorder.snap @@ -6,27 +6,27 @@ info: --- > vp run @ expect-milestone: task-select::0 -Search task (↑/↓ to move, enter to select): -> build: echo build app - lint: echo lint app - test: echo test app - lib#build: echo build lib - lib#lint: echo lint lib - lib#test: echo test lib - lib#typecheck: echo typecheck lib - task-select-test#check: echo check root - task-select-test#clean: echo clean root - task-select-test#deploy: echo deploy root - task-select-test#docs: echo docs root - task-select-test#format: echo format root +Select a task (↑/↓, Enter to run, Esc to clear): + › build: echo build app + lint: echo lint app + test: echo test app + lib#build: echo build lib + lib#lint: echo lint lib + lib#test: echo test lib + lib#typecheck: echo typecheck lib + task-select-test#check: echo check root + task-select-test#clean: echo clean root + task-select-test#deploy: echo deploy root + task-select-test#docs: echo docs root + task-select-test#format: echo format root (…3 more) @ write: lib# @ expect-milestone: task-select:lib#:0 -Search task (↑/↓ to move, enter to select): lib# -> lib#build: echo build lib - lib#lint: echo lint lib - lib#test: echo test lib - lib#typecheck: echo typecheck lib +Select a task (↑/↓, Enter to run, Esc to clear): lib# + › lib#build: echo build lib + lib#lint: echo lint lib + lib#test: echo test lib + lib#typecheck: echo typecheck lib @ write-key: enter Selected task: lib#build ~/packages/lib$ echo build lib ⊘ cache disabled diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive select task from lib.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive select task from lib.snap index 8d1b475a..9cf95565 100644 --- a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive select task from lib.snap +++ b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive select task from lib.snap @@ -6,19 +6,19 @@ info: --- > vp run @ expect-milestone: task-select::0 -Search task (↑/↓ to move, enter to select): -> build: echo build lib - lint: echo lint lib - test: echo test lib - typecheck: echo typecheck lib - app#build: echo build app - app#lint: echo lint app - app#test: echo test app - task-select-test#check: echo check root - task-select-test#clean: echo clean root - task-select-test#deploy: echo deploy root - task-select-test#docs: echo docs root - task-select-test#format: echo format root +Select a task (↑/↓, Enter to run, Esc to clear): + › build: echo build lib + lint: echo lint lib + test: echo test lib + typecheck: echo typecheck lib + app#build: echo build app + app#lint: echo lint app + app#test: echo test app + task-select-test#check: echo check root + task-select-test#clean: echo clean root + task-select-test#deploy: echo deploy root + task-select-test#docs: echo docs root + task-select-test#format: echo format root (…3 more) @ write-key: enter Selected task: build diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive select task.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive select task.snap index 3dacc4d2..5a2cdc30 100644 --- a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive select task.snap +++ b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive select task.snap @@ -6,35 +6,35 @@ info: --- > vp run @ expect-milestone: task-select::0 -Search task (↑/↓ to move, enter to select): -> build: echo build app - lint: echo lint app - test: echo test app - lib#build: echo build lib - lib#lint: echo lint lib - lib#test: echo test lib - lib#typecheck: echo typecheck lib - task-select-test#check: echo check root - task-select-test#clean: echo clean root - task-select-test#deploy: echo deploy root - task-select-test#docs: echo docs root - task-select-test#format: echo format root +Select a task (↑/↓, Enter to run, Esc to clear): + › build: echo build app + lint: echo lint app + test: echo test app + lib#build: echo build lib + lib#lint: echo lint lib + lib#test: echo test lib + lib#typecheck: echo typecheck lib + task-select-test#check: echo check root + task-select-test#clean: echo clean root + task-select-test#deploy: echo deploy root + task-select-test#docs: echo docs root + task-select-test#format: echo format root (…3 more) @ write-key: down @ expect-milestone: task-select::1 -Search task (↑/↓ to move, enter to select): - build: echo build app -> lint: echo lint app - test: echo test app - lib#build: echo build lib - lib#lint: echo lint lib - lib#test: echo test lib - lib#typecheck: echo typecheck lib - task-select-test#check: echo check root - task-select-test#clean: echo clean root - task-select-test#deploy: echo deploy root - task-select-test#docs: echo docs root - task-select-test#format: echo format root +Select a task (↑/↓, Enter to run, Esc to clear): + build: echo build app + › lint: echo lint app + test: echo test app + lib#build: echo build lib + lib#lint: echo lint lib + lib#test: echo test lib + lib#typecheck: echo typecheck lib + task-select-test#check: echo check root + task-select-test#clean: echo clean root + task-select-test#deploy: echo deploy root + task-select-test#docs: echo docs root + task-select-test#format: echo format root (…3 more) @ write-key: enter Selected task: lint diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive select with typo.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive select with typo.snap index 34bae938..ec15563c 100644 --- a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive select with typo.snap +++ b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive select with typo.snap @@ -7,9 +7,9 @@ info: > vp run buid @ expect-milestone: task-select:buid:0 Task "buid" not found. -Search task (↑/↓ to move, enter to select): buid -> build: echo build app - lib#build: echo build lib +Select a task (↑/↓, Enter to run, Esc to clear): buid + › build: echo build app + lib#build: echo build lib @ write-key: enter Selected task: build ~/packages/app$ echo build app ⊘ cache disabled diff --git a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/verbose with typo enters selector.snap b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/verbose with typo enters selector.snap index 7fe98fbe..69ecca90 100644 --- a/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/verbose with typo enters selector.snap +++ b/crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/verbose with typo enters selector.snap @@ -7,9 +7,9 @@ info: > vp run buid --verbose @ expect-milestone: task-select:buid:0 Task "buid" not found. -Search task (↑/↓ to move, enter to select): buid -> build: echo build app - lib#build: echo build lib +Select a task (↑/↓, Enter to run, Esc to clear): buid + › build: echo build app + lib#build: echo build lib @ write-key: enter Selected task: build ~/packages/app$ echo build app ⊘ cache disabled diff --git a/crates/vite_tui/src/config.rs b/crates/vite_tui/src/config.rs index 9a75a6f5..373d1097 100644 --- a/crates/vite_tui/src/config.rs +++ b/crates/vite_tui/src/config.rs @@ -402,7 +402,7 @@ fn project_directory() -> Option { // Some(Color::Indexed(12)) // } else if s == "bold magenta" { // Some(Color::Indexed(13)) -// } else if s == "bold cyan" { +// } else if s == "bold blue" { // Some(Color::Indexed(14)) // } else if s == "bold white" { // Some(Color::Indexed(15)) @@ -418,7 +418,7 @@ fn project_directory() -> Option { // Some(Color::Indexed(4)) // } else if s == "magenta" { // Some(Color::Indexed(5)) -// } else if s == "cyan" { +// } else if s == "blue" { // Some(Color::Indexed(6)) // } else if s == "white" { // Some(Color::Indexed(7)) diff --git a/justfile b/justfile index c465969b..baf03396 100644 --- a/justfile +++ b/justfile @@ -25,7 +25,8 @@ watch *args='': watchexec --no-vcs-ignore {{args}} fmt: - cargo shear --fix + # cargo-shear currently misflags the `fspy_test_bin` artifact bindep in crates/fspy. + cargo shear --fix --exclude fspy cargo fmt --all dprint fmt From 874d0b7e626ed04d649a277f29c9c02ea6c04f32 Mon Sep 17 00:00:00 2001 From: branchseer <3612422+branchseer@users.noreply.github.com> Date: Wed, 4 Mar 2026 22:59:48 +0800 Subject: [PATCH 2/2] revert cargo shear change --- .github/workflows/ci.yml | 3 +-- justfile | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 67754e62..fb194f29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -111,8 +111,7 @@ jobs: components: clippy rust-docs rustfmt - run: dprint check - # cargo-shear currently misflags the `fspy_test_bin` artifact bindep in crates/fspy. - - run: cargo shear --exclude fspy + - run: cargo shear - run: cargo fmt --check - run: RUSTDOCFLAGS='-D warnings' cargo doc --no-deps --document-private-items diff --git a/justfile b/justfile index baf03396..c465969b 100644 --- a/justfile +++ b/justfile @@ -25,8 +25,7 @@ watch *args='': watchexec --no-vcs-ignore {{args}} fmt: - # cargo-shear currently misflags the `fspy_test_bin` artifact bindep in crates/fspy. - cargo shear --fix --exclude fspy + cargo shear --fix cargo fmt --all dprint fmt