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

utils/shfmt.sh: allow single line if blocks

Browse Source
This commit is contained in:
XuehaiPan 2021-11-12 19:23:10 +08:00
parent 391e7e22f8
commit 50cde98fd3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,6 +292,7 @@ wrap_then_do() {
local -a processed=() local -a processed=()
local -a buffer=() local -a buffer=()
local line local line
local singleline_if_then_fi_regex='^( *)if (.+)\; then (.+)\; fi( *#.*)?$'
local singleline_if_then_regex='^( *)(el)?if (.+)\; (then( *#.*)?)$' local singleline_if_then_regex='^( *)(el)?if (.+)\; (then( *#.*)?)$'
local singleline_for_do_regex='^( *)(for|while) (.+)\; (do( *#.*)?)$' local singleline_for_do_regex='^( *)(for|while) (.+)\; (do( *#.*)?)$'
local multiline_if_then_begin_regex='^( *)(el)?if ' local multiline_if_then_begin_regex='^( *)(el)?if '
@ -301,7 +302,10 @@ wrap_then_do() {
do do
if [[ "${#buffer[@]}" == 0 ]] if [[ "${#buffer[@]}" == 0 ]]
then then
if [[ "${line}" =~ ${singleline_if_then_regex} ]] if [[ "${line}" =~ ${singleline_if_then_fi_regex} ]]
then
processed+=("${line}")
elif [[ "${line}" =~ ${singleline_if_then_regex} ]]
then then
processed+=("${BASH_REMATCH[1]}${BASH_REMATCH[2]}if ${BASH_REMATCH[3]}") processed+=("${BASH_REMATCH[1]}${BASH_REMATCH[2]}if ${BASH_REMATCH[3]}")
processed+=("${BASH_REMATCH[1]}${BASH_REMATCH[4]}") processed+=("${BASH_REMATCH[1]}${BASH_REMATCH[4]}")