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

Rename Go auto-insertion hooks to make it easier to disable them

Browse Source 
The canonical way to disable all auto-insertion hooks is

	set-option global disabled_hooks .*-insert

A recent change allowed to disable hooks that insert ) and }
independent of hooks that insert // (a step in the right
direction, we should do it for more filetypes).

Since the new hook ("go-insert-closing-delimiter") doesn't match
.*-insert, it broke the above snippet.  Fix this by renaming it to
"go-closing-delimiter-insert".

This makes it a bit less obvious how to disable only comment insertion.
Not sure if there's interest in that, but make it easier by renaming
"go-insert" to "go-comment-insert".
This commit is contained in:
Johannes Altmanninger 2022-06-24 10:52:56 +02:00
parent 6565f6edd7
commit d891e7e63e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rc/filetype/go.kak
View File

@ -21,8 +21,8 @@ hook global WinSetOption filetype=go %{
hook window InsertChar \n -group go-indent go-indent-on-new-line hook window InsertChar \n -group go-indent go-indent-on-new-line
hook window InsertChar \{ -group go-indent go-indent-on-opening-curly-brace hook window InsertChar \{ -group go-indent go-indent-on-opening-curly-brace
hook window InsertChar \} -group go-indent go-indent-on-closing-curly-brace hook window InsertChar \} -group go-indent go-indent-on-closing-curly-brace
hook window InsertChar \n -group go-insert go-insert-on-new-line hook window InsertChar \n -group go-comment-insert go-insert-comment-on-new-line
hook window InsertChar \n -group go-insert-closing-delimiter go-insert-closing-delimiter-on-new-line hook window InsertChar \n -group go-closing-delimiter-insert go-insert-closing-delimiter-on-new-line
alias window alt go-alternative-file alias window alt go-alternative-file
@ -131,7 +131,7 @@ define-command -hidden go-indent-on-closing-curly-brace %[
try %[ execute-keys -itersel -draft <a-h><a-k>^\h+\}$<ret>hms\A|.\z<ret>1<a-&> ] try %[ execute-keys -itersel -draft <a-h><a-k>^\h+\}$<ret>hms\A|.\z<ret>1<a-&> ]
] ]
define-command -hidden go-insert-on-new-line %[ define-command -hidden go-insert-comment-on-new-line %[
evaluate-commands -no-hooks -draft -itersel %[ evaluate-commands -no-hooks -draft -itersel %[
# copy // comments prefix and following white spaces # copy // comments prefix and following white spaces
try %{ execute-keys -draft <semicolon><c-s>k<a-x> s ^\h*\K/{2,}\h* <ret> y<c-o>P<esc> } try %{ execute-keys -draft <semicolon><c-s>k<a-x> s ^\h*\K/{2,}\h* <ret> y<c-o>P<esc> }

2
test/indent/go/insert-comment/rc
View File

@ -1,4 +1,4 @@
source "%val{runtime}/colors/default.kak" source "%val{runtime}/colors/default.kak"
source "%val{runtime}/rc/filetype/go.kak" source "%val{runtime}/rc/filetype/go.kak"
set buffer filetype go set buffer filetype go
set-option global disabled_hooks go-insert-closing-delimiter set-option global disabled_hooks go-closing-delimiter-insert