From 87e15f87f3e077f24df0d78c5931d286ffee40cf Mon Sep 17 00:00:00 2001 From: Michael Wolf Date: Sat, 30 Sep 2023 19:05:52 -0600 Subject: [PATCH] Teach do-reformat.sh to use the more extensible stuff --- do-reformat.sh | 45 +++++++++++++++------------------------------ 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/do-reformat.sh b/do-reformat.sh index a1fd2f5..5c183eb 100755 --- a/do-reformat.sh +++ b/do-reformat.sh @@ -9,40 +9,25 @@ source "$DIR/_reformat-common.bash" file="$1" +PROJECT_ROOT=$(project_root "$file") +export PROJECT_ROOT="$PROJECT_ROOT" +WF_ROOT=$(wf_root) +export WF_ROOT="$WF_ROOT" + file_type=$(sniff_file_type "$file") export WOULD_REFORMAT=do_reformat -if [[ $file_type == "javascript" || - $file_type == "vue" || - $file_type == "css" || - $file_type == "typescript" || - $file_type == "php" || - $file_type == "html" || - $file_type == "jsx" || - $file_type == "tsx" || - $file_type == "css" || - $file_type == "scss" || - $file_type == "sh" ]]; then - out=$("$(wf_root)"/./prettier.sh "$file") - retval="$?" - success_retval=0 -elif [[ $file_type == "python" ]]; then - out=$(pipx run black "$file" 2>/dev/null && pipx run isort "$file" 2>/dev/null) - retval="$?" - success_retval=0 -elif [[ $file_type == "golang" ]]; then - out=$(gofmt -w "$file" 2>/dev/null) - retval="$?" - success_retval=0 -elif [[ $file_type == "dart" ]]; then - out=$(dart format "$file") - retval="$?" - success_retval=0 -else - echo -n "ignoring" - exit 0 -fi +wrapper=$(choose_wrapper "$file_type") + +wrflog got wrapper: $wrapper + +set +e +out=$("$wrapper" "$file" 2>&1 >/dev/null) +retval="$?" +set -e + +success_retval=0 if [[ "$retval" == "$success_retval" ]]; then echo "$out"