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

Take the formatting function out of the hook

Browse Source
This commit is contained in:
Frank LENORMAND 2015-09-06 18:05:33 +03:00
parent b1598f9542
commit 88775a91b3
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rc/dlang.kak
View File

@ -16,8 +16,8 @@ addhl -group / regions -default code dlang \
string '"' (?<!\\)(\\\\)*" '' \ string '"' (?<!\\)(\\\\)*" '' \
verbatim_string ` ` '' \ verbatim_string ` ` '' \
verbatim_string_prefixed 'r"' '"' '' \ verbatim_string_prefixed 'r"' '"' '' \
token '#' '\n' '' \ token '#' '\n' '' \
disabled /\+ \+/ '' \ disabled /\+ \+/ '' \
comment /\* \*/ '' \ comment /\* \*/ '' \
comment '//' $ '' comment '//' $ ''
@ -71,16 +71,18 @@ def -hidden _dlang-indent-on-closing-curly-brace %[
] ]
decl str dlang_dfmt_options "" decl str dlang_dfmt_options ""
def dlang-enable-dfmt -docstring "Format the code using the dfmt utility upon saving" %{ def dlang-format-dfmt -docstring "Format the code using the dfmt utility" %{
hook buffer -group dlang-formatter BufWritePre .* %{ %sh{
%sh{ readonly x=$((kak_cursor_column - 1))
echo "exec -draft %{%|dfmt<space>${kak_opt_dlang_dfmt_options// /<space>}<ret>}" readonly y="${kak_cursor_line}"
}
echo "exec -draft %{%|dfmt<space>${kak_opt_dlang_dfmt_options// /<space>}<ret>}"
echo "exec gg ${y}g ${x}l"
} }
} }
def dlang-disable-dfmt -docstring "Disable automatic code formatting" %{ def dlang-disable-dfmt -docstring "Disable automatic code formatting" %{
rmhooks buffer dlang-formatter rmhooks buffer dlang-formatter
} }
# Initialization # Initialization
@ -94,10 +96,15 @@ hook global WinSetOption filetype=dlang %{
hook window InsertChar \n -group dlang-indent _dlang-indent-on-new-line hook window InsertChar \n -group dlang-indent _dlang-indent-on-new-line
hook window InsertChar \{ -group dlang-indent _dlang-indent-on-opening-curly-brace hook window InsertChar \{ -group dlang-indent _dlang-indent-on-opening-curly-brace
hook window InsertChar \} -group dlang-indent _dlang-indent-on-closing-curly-brace hook window InsertChar \} -group dlang-indent _dlang-indent-on-closing-curly-brace
alias global format-code dlang-format-dfmt
} }
hook global WinSetOption filetype=(?!dlang).* %{ hook global WinSetOption filetype=(?!dlang).* %{
rmhl dlang rmhl dlang
rmhooks window dlang-hooks rmhooks window dlang-hooks
rmhooks window dlang-indent rmhooks window dlang-indent
unalias global format-code
} }