diff options
| author | Frank LENORMAND <lenormf@gmail.com> | 2019-10-22 11:02:06 +0200 |
|---|---|---|
| committer | Frank LENORMAND <lenormf@gmail.com> | 2019-10-22 11:02:06 +0200 |
| commit | 21614cb06ea4f7a7349c628e5b8a754f730b2f0d (patch) | |
| tree | a5a65ba0f4489808cf312a2db9e0d5699874ff40 /rc/filetype/java.kak | |
| parent | 3c34de7fe7db607fe2c0519471b8d3c4935ce717 (diff) | |
src: Create a <semicolon> named key
This commit allows using the <semicolon> expansion in commands, instead
of `\;`.
It makes commands look more elegant, and prevents new-comers from
falling into the trap of using <a-;> without escaping the semicolon.
Diffstat (limited to 'rc/filetype/java.kak')
| -rw-r--r-- | rc/filetype/java.kak | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rc/filetype/java.kak b/rc/filetype/java.kak index 9db24740..829652c4 100644 --- a/rc/filetype/java.kak +++ b/rc/filetype/java.kak @@ -43,7 +43,7 @@ add-highlighter shared/java/code/ regex "(?<!\w)@\w+\b" 0:meta define-command -hidden java-indent-on-new-line %~ evaluate-commands -draft -itersel %= # preserve previous line indent - try %{ execute-keys -draft \;K<a-&> } + try %{ execute-keys -draft <semicolon>K<a-&> } # indent after lines ending with { or ( try %[ execute-keys -draft k<a-x> <a-k> [{(]\h*$ <ret> j<a-gt> ] # cleanup trailing white spaces on the previous line @@ -51,11 +51,11 @@ define-command -hidden java-indent-on-new-line %~ # align to opening paren of previous line try %{ execute-keys -draft [( <a-k> \A\([^\n]+\n[^\n]*\n?\z <ret> s \A\(\h*.|.\z <ret> '<a-;>' & } # copy // comments prefix - try %{ execute-keys -draft \;<c-s>k<a-x> s ^\h*\K/{2,} <ret> y<c-o>P<esc> } + try %{ execute-keys -draft <semicolon><c-s>k<a-x> s ^\h*\K/{2,} <ret> y<c-o>P<esc> } # indent after a switch's case/default statements try %[ execute-keys -draft k<a-x> <a-k> ^\h*(case|default).*:$ <ret> j<a-gt> ] # indent after keywords - try %[ execute-keys -draft \;<a-F>)MB <a-k> \A(if|else|while|for|try|catch)\h*\(.*\)\h*\n\h*\n?\z <ret> s \A|.\z <ret> 1<a-&>1<a-space><a-gt> ] + try %[ execute-keys -draft <semicolon><a-F>)MB <a-k> \A(if|else|while|for|try|catch)\h*\(.*\)\h*\n\h*\n?\z <ret> s \A|.\z <ret> 1<a-&>1<a-space><a-gt> ] = ~ |
