Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Do not print extraneous newlines when executionInfo output is hidden #519

Merged
merged 4 commits into from
Jul 18, 2023
Merged

fix: Do not print extraneous newlines when executionInfo output is hidden #519

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27aca37
refactor: Simplify printing of `execLog`
hyperupcall Jul 14, 2023
c972c23
fix: Do not print extra newlines if `execution_info` output is hidden
hyperupcall Jul 14, 2023
d723973
Move check for execution skipping
hyperupcall Jul 18, 2023
bef3364
fix: correct skips for execution info and out
mrexox Jul 18, 2023
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
8 changes: 5 additions & 3 deletions internal/lefthook/runner/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,19 +478,21 @@ func (r *Runner) logExecute(name string, err error, out io.Reader) {
var execLog string
switch {
case r.SkipSettings.SkipExecutionInfo():
execLog = "\n"
execLog = ""
case err != nil:
execLog = fmt.Sprint(log.Red("\n EXECUTE > "), log.Bold(name))
default:
execLog = fmt.Sprint(log.Cyan("\n EXECUTE > "), log.Bold(name))
}

if err == nil && r.SkipSettings.SkipExecutionOutput() {
if execLog != "" {
log.Info(execLog)
}

if err == nil && r.SkipSettings.SkipExecutionOutput() {
Comment on lines +488 to +492
Copy link
Member

@mrexox mrexox Jul 17, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The check for execution skipping should go first.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done 👍

So I guess this means that the previous log.Info(execLog) was not intended to be there - Because it seems that now the behavior just changed so that execLog is never printed when the condition err == nil && r.SkipSettings.SkipExecutionOutput() is met.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh god, I'm sorry. execLog shouldn't be printed if it is empty. That's right. And if we have SkipExecutionOutput() then we don't print command output. So, your previous solution was correct. Let me fix that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haha yeah I thought something was fishy - glad it's sorted out now 😅

return
}

log.Info(execLog)
if out != nil {
log.Info(out)
}
Expand Down