diff options
| author | Maxime Coste <mawww@kakoune.org> | 2020-08-24 19:24:19 +1000 |
|---|---|---|
| committer | Maxime Coste <mawww@kakoune.org> | 2020-08-24 19:24:19 +1000 |
| commit | 4b7fd68d48061cc9c1cbf4a89ae5b2d60937f7e3 (patch) | |
| tree | dfb4f9c1e49abc5a7dff02ff7db2b0eeee37ebd8 /rc/filetype/sh.kak | |
| parent | beeaf19801dbfd7bc2211d81e793a8a3ddcb6052 (diff) | |
| parent | ab76ec981ade6f0cec7fc9a153d749cf148b69f4 (diff) | |
Merge remote-tracking branch 'krobelus/indent-after-keyword'
Diffstat (limited to 'rc/filetype/sh.kak')
| -rw-r--r-- | rc/filetype/sh.kak | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/rc/filetype/sh.kak b/rc/filetype/sh.kak index 5f0744a6..38e26bb2 100644 --- a/rc/filetype/sh.kak +++ b/rc/filetype/sh.kak @@ -112,9 +112,9 @@ define-command -hidden sh-indent-on-new-line %[ # done # # indent after do - try %{ execute-keys -draft <space> k <a-x> <a-k> do$ <ret> j <a-gt> } + try %{ execute-keys -draft <space> k <a-x> <a-k> \bdo$ <ret> j <a-gt> } # deindent after done - try %{ execute-keys -draft <space> k <a-x> <a-k> done$ <ret> K <a-&> j <a-lt> j K <a-&> } + try %{ execute-keys -draft <space> k <a-x> <a-k> \bdone$ <ret> K <a-&> j <a-lt> j K <a-&> } # Indent if/then/else syntax, e.g.: # if [ $foo = $bar ]; then @@ -132,12 +132,12 @@ define-command -hidden sh-indent-on-new-line %[ # fi # # indent after then - try %{ execute-keys -draft <space> k <a-x> <a-k> then$ <ret> j <a-gt> } + try %{ execute-keys -draft <space> k <a-x> <a-k> \bthen$ <ret> j <a-gt> } # deindent after fi - try %{ execute-keys -draft <space> k <a-x> <a-k> fi$ <ret> K <a-&> j <a-lt> j K <a-&> } + try %{ execute-keys -draft <space> k <a-x> <a-k> \bfi$ <ret> K <a-&> j <a-lt> j K <a-&> } # deindent and reindent after else - deindent the else, then back # down and return to the previous indent level. - try %{ execute-keys -draft <space> k <a-x> <a-k> else$ <ret> <a-lt> j } + try %{ execute-keys -draft <space> k <a-x> <a-k> \belse$ <ret> <a-lt> j } # Indent case syntax, e.g.: # case "$foo" in @@ -157,9 +157,9 @@ define-command -hidden sh-indent-on-new-line %[ # esac # # indent after in - try %{ execute-keys -draft <space> k <a-x> <a-k> in$ <ret> j <a-gt> } + try %{ execute-keys -draft <space> k <a-x> <a-k> \bin$ <ret> j <a-gt> } # deindent after esac - try %{ execute-keys -draft <space> k <a-x> <a-k> esac$ <ret> <a-lt> j K <a-&> } + try %{ execute-keys -draft <space> k <a-x> <a-k> \besac$ <ret> <a-lt> j K <a-&> } # indent after ) try %{ execute-keys -draft <space> k <a-x> <a-k> ^\s*\(?[^(]+[^)]\)$ <ret> j <a-gt> } # deindent after ;; |