xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add hare comments and indentation

Browse Source
This commit is contained in:
Jon Eskin 2022-06-09 04:29:32 -04:00
parent 3aaee810be
commit 1898528421
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rc/filetype/hare.kak
View File

@ -9,6 +9,8 @@ hook global WinSetOption filetype=hare %{
hook window ModeChange pop:insert:.* -group hare-trim-indent hare-trim-indent hook window ModeChange pop:insert:.* -group hare-trim-indent hare-trim-indent
hook window InsertChar \n -group hare-indent hare-indent-on-new-line hook window InsertChar \n -group hare-indent hare-indent-on-new-line
hook window InsertChar \n -group hare-insert hare-insert-on-new-line hook window InsertChar \n -group hare-insert hare-insert-on-new-line
hook window InsertChar \{ -group hare-indent hare-indent-on-opening-curly-brace
hook window InsertChar \} -group hare-indent hare-indent-on-closing-curly-brace
} }
hook -group hare-highlight global WinSetOption filetype=hare %{ hook -group hare-highlight global WinSetOption filetype=hare %{
@ -17,7 +19,7 @@ hook -group hare-highlight global WinSetOption filetype=hare %{
} }
# highlighters # highlighters
provide-module hare %{ provide-module hare %§
add-highlighter shared/hare regions add-highlighter shared/hare regions
add-highlighter shared/hare/code default-region group add-highlighter shared/hare/code default-region group
add-highlighter shared/hare/comment region // $ fill comment add-highlighter shared/hare/comment region // $ fill comment
@ -92,6 +94,14 @@ provide-module hare %{
define-command -hidden hare-indent-on-new-line %{ evaluate-commands -draft -itersel %{ define-command -hidden hare-indent-on-new-line %{ evaluate-commands -draft -itersel %{
# preserve indentation on new lines # preserve indentation on new lines
try %{ execute-keys -draft <semicolon> 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 i<tab> ]
# cleanup trailing white spaces on the previous line
try %{ execute-keys -draft k<a-x> s \h+$ <ret>d }
# indent after a switch's case/default statements
try %[ execute-keys -draft k<a-x> <a-k> ^\h*(case|default).*:$ <ret> j<a-gt> ]
# deindent closing brace(s) when after cursor
try %[ execute-keys -draft <a-x> <a-k> ^\h*[})] <ret> gh / [})] <ret> m <a-S> 1<a-&> ]
# remove trailing whitespace on the above line # remove trailing whitespace on the above line
execute-keys -draft k :hare-trim-indent <ret> execute-keys -draft k :hare-trim-indent <ret>
} } } }
@ -111,6 +121,16 @@ provide-module hare %{
} }
} } } }
define-command -hidden hare-indent-on-opening-curly-brace %[
# align indent with opening paren when { is entered on a new line after the closing paren
try %[ execute-keys -draft -itersel h<a-F>)M <a-k> \A\(.*\)\h*\n\h*\{\z <ret> s \A|.\z <ret> 1<a-&> ]
]
define-command -hidden hare-indent-on-closing-curly-brace %[
# align to opening curly brace when alone on a line
try %[ execute-keys -itersel -draft <a-h><a-k>^\h+\}$<ret>hms\A|.\z<ret>1<a-&> ]
]
define-command -hidden hare-trim-indent %{ evaluate-commands -draft -itersel %{ define-command -hidden hare-trim-indent %{ evaluate-commands -draft -itersel %{
# remove trailing whitespace # remove trailing whitespace
try %{ execute-keys -draft <a-x> s \h+$ <ret> d } try %{ execute-keys -draft <a-x> s \h+$ <ret> d }
@ -119,4 +139,4 @@ provide-module hare %{
# TODO # TODO
# const/null/void/size are ambiguous # const/null/void/size are ambiguous
# indentation (copy c-family.kak) # indentation (copy c-family.kak)
} §

2
rc/tools/comment.kak
View File

@ -118,7 +118,7 @@ hook global BufSetOption filetype=perl %{
set-option buffer comment_block_end ']' set-option buffer comment_block_end ']'
} }
hook global BufSetOption filetype=(pug|zig|cue) %{ hook global BufSetOption filetype=(pug|zig|cue|hare) %{
set-option buffer comment_line '//' set-option buffer comment_line '//'
} }