diff options
| author | gxb152 | 2020-05-05 14:36:08 +0800 |
|---|---|---|
| committer | gxb152 | 2020-05-05 14:36:08 +0800 |
| commit | a04998411cd37c0a8bb748c9b2c8ef8b043ac2b9 (patch) | |
| tree | 3ed9c59f949764e2449897625e68e80d843ce9f9 | |
| parent | 59c095a08aaf9cd669acfd7b2007c492f674f8f2 (diff) | |
| parent | adcc7a980474de58bdd693ced8d94df1ee3f37d7 (diff) | |
| download | aur-a04998411cd37c0a8bb748c9b2c8ef8b043ac2b9.tar.gz | |
Merge branch 'master' of ssh://aur.archlinux.org/mtaaat
| -rwxr-xr-x | black_pycharm_formatter.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/black_pycharm_formatter.sh b/black_pycharm_formatter.sh index a176fc381f49..0d0256a1624f 100755 --- a/black_pycharm_formatter.sh +++ b/black_pycharm_formatter.sh @@ -2,10 +2,21 @@ case $2 in "py") +<<<<<<< HEAD black -l 80 -S $1 ;; "ipynb") cmd="$3/jupytext" $cmd $1 --pipe "black -l 80 -S {}" +======= + black -l 80 -S $1 2> /dev/null + ;; + "ipynb") + file_path="/tmp/black_pycharm_jupyter_cell_formatter.py" + cmd="$3/ipynb-py-convert" + $cmd $1 $file_path + black -l 80 -S $file_path 2> /dev/null + $cmd $file_path $1 +>>>>>>> adcc7a980474de58bdd693ced8d94df1ee3f37d7 ;; esac |