Skip to content

Commit 3948408

Browse files
committed
build-aux: Update gersemi formatting script
1 parent ab20975 commit 3948408

File tree

1 file changed

+19
-6
lines changed

1 file changed

+19
-6
lines changed

build-aux/.run-format.zsh

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ invoke_formatter() {
9696
if (( ${+commands[gersemi]} )) {
9797
local gersemi_version=($(gersemi --version))
9898

99-
if ! is-at-least 0.21.0 ${gersemi_version[2]}; then
100-
log_error "gersemi is not version 0.21.0 or above (found ${gersemi_version[2]}."
99+
if ! is-at-least 0.25.0 ${gersemi_version[2]}; then
100+
log_error "gersemi is not version 0.25.0 or above (found ${gersemi_version[2]}."
101101
exit 2
102102
fi
103103
}
@@ -112,16 +112,29 @@ invoke_formatter() {
112112
local -a source_files=($@)
113113
local file
114114
local -a command=(${formatter} -c --no-cache ${source_files})
115+
local -i in_error=0
115116

116117
if (( ${#source_files} )) {
117118
while read -r line; do
118119
local -a line_tokens=(${(z)line})
119120
if (( #line_tokens )) {
120-
file=${line_tokens[1]//*${project_root}\//}
121-
122-
log_error "${file} requires formatting changes."
121+
file=${line_tokens[1]}
122+
123+
if [[ -r ${file} ]] {
124+
in_error=0
125+
file=${file//*${project_root}\//}
126+
127+
log_error "${file} requires formatting changes."
128+
} else {
129+
if (( in_error )) {
130+
log_output "${line}"
131+
} else {
132+
log_error "${line}"
133+
}
134+
in_error=1
135+
}
123136
} else {
124-
log_error "${line}"
137+
log_output "${line}"
125138
}
126139

127140
if (( fail_on_error == 2 )) return 2

0 commit comments

Comments
 (0)