admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

utils/shfmt.sh: refactor function align_multiline_if_condition

Browse Source
This commit is contained in:
XuehaiPan 2021-09-16 23:26:23 +08:00
parent d559d3ff46
commit 065c5b79fe
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Library/Homebrew/utils/shfmt.sh
View File

@ -202,18 +202,23 @@ no_forbidden_styles() {
# then then # then then
# #
# before: after: # before: after:
# if [[ -n ... || \ if [[ -n ... || \ # if [[ -n ... || if [[ -n ... ||
# -n ... ]] -n ... ]] # -n ... ]] -n ... ]]
# then then # then then
# #
align_multiline_if_condition() { align_multiline_if_condition() {
local multiline_if_begin_regex='^( *)(el)?if '
local multiline_then_end_regex='^(.*)\; (then( *#.*)?)$'
local within_test_regex='^( *)(((! )?-[fdrwxes])|([^\[]+ == ))'
local base_indent=''
local extra_indent=''
local line local line
local lastline='' local lastline=''
local base_indent='' # indents before `if`
local extra_indent='' # 2 extra spaces for `elif`
local multiline_if_begin_regex='^( *)(el)?if '
local multiline_then_end_regex='^(.*)\; (then( *#.*)?)$'
local within_test_regex='^( *)(((! )?-[fdLrwxeszn] )|([^\[]+ == ))'
trim() {
[[ "$1" =~ [^[:space:]](.*[^[:space:]])? ]]
printf "%s" "${BASH_REMATCH[0]}"
}
if [[ "$1" =~ ${multiline_if_begin_regex} ]] if [[ "$1" =~ ${multiline_if_begin_regex} ]]
then then
@ -234,9 +239,9 @@ align_multiline_if_condition() {
fi fi
if [[ "${line}" =~ ${within_test_regex} ]] if [[ "${line}" =~ ${within_test_regex} ]]
then then
echo " ${extra_indent}${line}" echo "${base_indent}${extra_indent} $(trim "${line}")"
else else
echo " ${extra_indent}${line}" echo "${base_indent}${extra_indent} $(trim "${line}")"
fi fi
done done
@ -250,7 +255,7 @@ align_multiline_if_condition() {
# #
# before: after: # before: after:
# if [[ ... ]] || if [[ ... ]] || # if [[ ... ]] || if [[ ... ]] ||
# [[ ... ]]; then [[ ... ]] # [[ ... ]]; then [[ ... ]]
# then # then
# #
# before: after: # before: after:
@ -261,13 +266,13 @@ wrap_then_do() {
local file="$1" local file="$1"
local tempfile="$2" local tempfile="$2"
local -a processed local -a processed=()
local -a buffer=()
local line local line
local singleline_then_regex='^( *)(el)?if (.+)\; (then( *#.*)?)$' local singleline_then_regex='^( *)(el)?if (.+)\; (then( *#.*)?)$'
local singleline_do_regex='^( *)(for|while) (.+)\; (do( *#.*)?)$' local singleline_do_regex='^( *)(for|while) (.+)\; (do( *#.*)?)$'
local multiline_if_begin_regex='^( *)(el)?if ' local multiline_if_begin_regex='^( *)(el)?if '
local multiline_then_end_regex='^(.*)\; (then( *#.*)?)$' local multiline_then_end_regex='^(.*)\; (then( *#.*)?)$'
local -a buffer=()
while IFS='' read -r line while IFS='' read -r line
do do
@ -303,7 +308,7 @@ wrap_then_do() {
printf "%s\n" "${processed[@]}" >"${tempfile}" printf "%s\n" "${processed[@]}" >"${tempfile}"
} }
# TODO: it's hard to align multiline switch cases # TODO: It's hard to align multiline switch cases
align_multiline_switch_cases() { align_multiline_switch_cases() {
true true
} }
@ -359,13 +364,15 @@ format() {
RETCODE=0 RETCODE=0
for file in "${FILES[@]}" for file in "${FILES[@]}"
do do
if ! format "${file}" format "${file}"
retcode="$?"
if [[ "${retcode}" != 0 ]]
then then
if [[ "$?" == 1 ]] if [[ "${retcode}" == 1 ]]
then then
onoe "${0##*/}: Failed to format file \"${file}\". Function exited with code 1." onoe "${0##*/}: Failed to format file \"${file}\". Formatter exited with code 1."
else else
onoe "${0##*/}: Bad style for file \"${file}\". Function exited with code 2." onoe "${0##*/}: Bad style for file \"${file}\". Formatter exited with code 2."
fi fi
onoe onoe
RETCODE=1 RETCODE=1