ficd/dotfiles
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AutoYADM commit: 2025-05-23 15:05:14

Browse source
This commit is contained in:
Daniel Fichtinger 2025-05-23 15:05:14 -04:00
parent 3ad7f2cee1
commit 48a80c37db
2 changed files with 19 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

35
.config/kak/autoload/filetype/jsonc.kak
View file

@ -6,6 +6,9 @@
hook global BufCreate .*[.](jsonc) %{
set-option buffer filetype jsonc
set-option buffer comment_line //
set-option buffer comment_block_begin /*
set-option buffer comment_block_end */
}
# Initialization
@ -14,16 +17,16 @@ hook global BufCreate .*[.](jsonc) %{
hook global WinSetOption filetype=jsonc %{
require-module jsonc
hook window ModeChange pop:insert:.* -group json-trim-indent json-trim-indent
hook window InsertChar .* -group json-indent json-indent-on-char
hook window InsertChar \n -group json-indent json-indent-on-new-line
hook window ModeChange pop:insert:.* -group jsonc-trim-indent jsonc-trim-indent
hook window InsertChar .* -group jsonc-indent jsonc-indent-on-char
hook window InsertChar \n -group jsonc-indent jsonc-indent-on-new-line
hook -once -always window WinSetOption filetype=.* %{ remove-hooks window json-.+ }
hook -once -always window WinSetOption filetype=.* %{ remove-hooks window jsonc-.+ }
}
hook -group json-highlight global WinSetOption filetype=json %{
add-highlighter window/json ref json
hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/json }
hook -group jsonc-highlight global WinSetOption filetype=jsonc %{
add-highlighter window/jsonc ref jsonc
hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/jsonc }
}
provide-module jsonc %(
@ -31,33 +34,33 @@ provide-module jsonc %(
# Highlighters
# ‾‾‾‾‾‾‾‾‾‾‾‾
add-highlighter shared/json regions
add-highlighter shared/json/code default-region group
add-highlighter shared/json/string region '"' (?<!\\)(\\\\)*" fill string
add-highlighter shared/json/code/ regex \b(true|false|null|\d+(?:\.\d+)?(?:[eE][+-]?\d*)?)\b 0:value
add-highlighter shared/jsonc regions
add-highlighter shared/jsonc/code default-region group
add-highlighter shared/jsonc/string region '"' (?<!\\)(\\\\)*" fill string
add-highlighter shared/jsonc/comment region // $ fill comment
add-highlighter shared/jsonc/code/ regex \b(true|false|null|\d+(?:\.\d+)?(?:[eE][+-]?\d*)?)\b 0:value
# Commands
# ‾‾‾‾‾‾‾‾
define-command -hidden json-trim-indent %{
define-command -hidden jsonc-trim-indent %{
# remove trailing white spaces
try %{ execute-keys -draft -itersel x s \h+$ <ret> d }
}
define-command -hidden json-indent-on-char %<
define-command -hidden jsonc-indent-on-char %<
evaluate-commands -draft -itersel %<
# align closer token to its opener when alone on a line
try %< execute-keys -draft <a-h> <a-k> ^\h+[\]}]$ <ret> m <a-S> 1<a-&> >
>
>
define-command -hidden json-indent-on-new-line %<
define-command -hidden jsonc-indent-on-new-line %<
evaluate-commands -draft -itersel %<
# preserve previous line indent
try %{ execute-keys -draft <semicolon> K <a-&> }
# filter previous line
try %{ execute-keys -draft k : json-trim-indent <ret> }
try %{ execute-keys -draft k : jsonc-trim-indent <ret> }
# indent after lines ending with opener token
try %< execute-keys -draft k x <a-k> [[{]\h*$ <ret> j <a-gt> >
# deindent closer token(s) when after cursor