mw/would-reformat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Teach it about isort in addition to black

Browse Source 
The design of this is starting to break down now and will need to be reworked
a bit.
This commit is contained in:
Michael Wolf
2021-03-15 10:37:38 -06:00
parent d59ac38a5b
commit 2eb0d7b9b0
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
do-reformat.sh
View File

@@ -26,7 +26,7 @@ if [[ $file_type == "javascript" || \
retval="$?" retval="$?"
success_retval=0 success_retval=0
elif [[ $file_type == "python" ]]; then elif [[ $file_type == "python" ]]; then
out=$(pipx run black $file 2>/dev/null) out=$(pipx run black $file 2>/dev/null && pipx run isort $file 2>/dev/null)
retval="$?" retval="$?"
success_retval=0 success_retval=0
else else

13
would-reformat.sh
View File

@@ -28,11 +28,20 @@ if [[ $file_type = "javascript" || \
would_reformat_retval=1 would_reformat_retval=1
syntax_error_retval=2 syntax_error_retval=2
elif [[ $file_type == "python" ]]; then elif [[ $file_type == "python" ]]; then
out=$(pipx run black --check $file 2>/dev/null)
retval="$?" out=$(pipx run isort --check $file 2>/dev/null)
isort_retval="$?"
success_retval=0 success_retval=0
would_reformat_retval=1 would_reformat_retval=1
syntax_error_retval=123 syntax_error_retval=123
if [[ x"$isort_retval" = x"0" ]] ; then
out=$(pipx run black --check $file 2>/dev/null)
retval="$?"
else
retval="$isort_retval"
fi
else else
echo -n "ignoring" echo -n "ignoring"
exit 0 exit 0