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
6 changes: 3 additions & 3 deletions crates/prek/src/cli/run/reporter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -555,17 +555,17 @@ impl HookRunReporter {
};

let label = if self.show_project_headers {
format!(" {}", hook.name)
Cow::Owned(format!(" {}", hook.name))
} else {
hook.name.clone()
Cow::Borrowed(hook.name.as_str())
};
let dots = self.dots.saturating_sub(label.width());
progress.set_style(
ProgressStyle::with_template(&format!("{{msg}}{{bar:{dots}.green/dim}}"))
.unwrap()
.progress_chars(".."),
);
progress.set_message(label);
progress.set_message(label.into_owned());
progress
}

Expand Down
7 changes: 7 additions & 0 deletions crates/prek/src/cli/run/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -913,6 +913,13 @@ impl<'a> HookRunSession<'a> {
"{detail_prefix}{}",
format!("- hook id: {}", result.hook.id).dimmed()
)?;
if !result.hook.alias.is_empty() && result.hook.alias != result.hook.id {
Comment thread
j178 marked this conversation as resolved.
writeln!(
stdout,
"{detail_prefix}{}",
format!("- hook alias: {}", result.hook.alias).dimmed()
Comment thread
j178 marked this conversation as resolved.
)?;
}
if let Some(description) = result.hook.description.as_deref()
&& let Some(description) = description.trim().lines().next()
{
Expand Down
46 changes: 46 additions & 0 deletions crates/prek/tests/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,52 @@ fn multiple_hook_ids() {
"#);
}

#[test]
fn run_displays_aliases_for_repeated_hook_ids() {
let context = TestContext::new();
context.init_project();

context.write_pre_commit_config(indoc::indoc! {r"
repos:
- repo: local
hooks:
- id: repeated
alias: repeated-format
name: Repeated hook
language: system
entry: git diff --quiet
always_run: true
pass_filenames: false
verbose: true
- id: repeated
alias: repeated-lint
name: Repeated hook
language: system
entry: git diff --quiet
always_run: true
pass_filenames: false
verbose: true
"});

context.git_add(".");

cmd_snapshot!(context.filters(), context.run().arg("repeated"), @r"
success: true
exit_code: 0
----- stdout -----
Repeated hook............................................................Passed
- hook id: repeated
- hook alias: repeated-format
- duration: [TIME]
Repeated hook............................................................Passed
- hook id: repeated
- hook alias: repeated-lint
- duration: [TIME]

----- stderr -----
");
}

#[test]
fn priorities_respected() {
let context = TestContext::new();
Expand Down
Loading