Update code formatter

This commit is contained in:
Arnie
2019-02-14 15:00:04 +01:00
parent e5c20726a8
commit e0f32d44b1
7 changed files with 20 additions and 16 deletions
+7 -2
View File
@@ -49,13 +49,18 @@ main() {
prettier)
__initVariables "$@"
source ${INCLUDES_PATH}/formatters/prettier.shinc
__prettier
if [[ ${#CSS_FILES[@]} -ne 0 ]]; then
__prettier ${CSS_FILES[@]}
fi
if [[ ${#JS_FILES[@]} -ne 0 ]]; then
__prettier ${JS_FILES[@]}
fi
return $?
;;
csscomb)
__initVariables "$@"
source ${INCLUDES_PATH}/formatters/csscomb.shinc
__csscomb
__csscomb ${CSS_FILES[@]}
return $?
;;
php-cs-fixer)
@@ -3,11 +3,12 @@
__csscomb() {
__msg "Csscomb:"
local files="${1}"
if [[ ${DRY_RUN} -eq 0 ]]; then
csscomb -v "${CSS_FILES[@]}"
csscomb -v "${files[@]}"
else
csscomb --lint -v "${CSS_FILES[@]}"
csscomb --lint -v "${files[@]}"
fi
return $?
@@ -3,12 +3,13 @@
__prettier() {
__msg "Prettier:"
local files="${1}"
if [[ ${DRY_RUN} -eq 0 ]]; then
prettier --write "${JS_FILES[@]}"
prettier --write "${files[@]}"
else
__msg "Listing (: unprettiered :) files:" 1
prettier --list-different "${JS_FILES[@]}"
prettier --list-different "${files[@]}"
fi
return $?
+4 -2
View File
@@ -11,13 +11,15 @@ process() {
# Run css comb
if [[ ${#CSS_FILES[@]} -ne 0 ]]; then
__csscomb
__csscomb "${CSS_FILES[@]}"
[[ $? -ne 0 ]] && failed=1
__prettier "${CSS_FILES[@]}"
[[ $? -ne 0 ]] && failed=1
fi
# Run JS prettier
if [[ ${#JS_FILES[@]} -ne 0 ]]; then
__prettier
__prettier "${JS_FILES[@]}"
[[ $? -ne 0 ]] && failed=1
fi