2 files changed, 99 insertions(+), 1 deletions(-)

A .config/kak/autoload/filetype/zig.kak
M .config/kak/kakrc

@@ 0,0 1,97 @@
+# Detection
+
+hook global BufCreate .*[.](zig) %{
+    set-option buffer filetype zig
+}
+
+# Highlighters
+
+add-highlighter shared/zig regions
+add-highlighter shared/zig/code default-region group
+add-highlighter shared/zig/string   region c?"       (?<!\\)(?:\\\\)*" group
+add-highlighter shared/zig/mlstring region %{c?\\\\} $                 fill string
+add-highlighter shared/zig/char     region c?'       (?<!\\)(?:\\\\)*' group
+add-highlighter shared/zig/comment  region //        $                 fill comment
+
+add-highlighter shared/zig/string/   fill string
+add-highlighter shared/zig/char/     fill string
+
+nop %sh{
+    escape='\\(?:[nrt\\'\''"]|x[a-zA-Z0-9]{2}|u\{[a-zA-Z0-9]+\})'
+    cat <<KAK
+        add-highlighter shared/zig/string/ regex ${escape} 0:default+b
+        add-highlighter shared/zig/char/ regex ${escape} 0:default+b
+        add-highlighter shared/zig/char/ regex %{'(?:[^\\]|${escape})([^']+)'} 1:Error
+KAK
+}
+
+add-highlighter shared/zig/code/ regex \b(const|var|extern|packed|export|pub|noalias|inline|comptime|nakedcc|stdcallcc|volatile|align|section)\b 0:keyword
+add-highlighter shared/zig/code/ regex \b(struct|enum|union)\b 0:keyword
+add-highlighter shared/zig/code/ regex \b(break|return|continue|asm|defer|errdefer|unreachable|try|catch|orelse|async|await|suspend|resume|cancel)\b 0:keyword
+add-highlighter shared/zig/code/ regex \b(if|else|switch|and|or)\b 0:keyword
+add-highlighter shared/zig/code/ regex \b(while|for)\b 0:keyword
+add-highlighter shared/zig/code/ regex \b(fn|use|test)\b 0:keyword
+
+add-highlighter shared/zig/code/ regex \b(bool|f32|f64|f128|void|noreturn|type|error|promise)\b 0:type
+add-highlighter shared/zig/code/ regex \b(u\d+|i\d+|isize|usize)\b 0:type
+add-highlighter shared/zig/code/ regex \b(c_short|c_ushort|c_int|c_uint|c_long|c_ulong|c_longlong|c_ulonglong|c_longdouble|c_void)\b 0:type
+
+add-highlighter shared/zig/code/ regex \b(null|undefined|this)\b 0:variable
+add-highlighter shared/zig/code/ regex \b(true|false)\b 0:value
+add-highlighter shared/zig/code/ regex \b[0-9]+(?:.[0-9]+)?(?:[eE][+-]?[0-9]+)? 0:value # decimal numeral
+add-highlighter shared/zig/code/ regex \b0x[a-fA-F0-9]+(?:[a-fA-F0-9]+(?:[pP][+-]?[0-9]+)?)? 0:value # hexadecimal numeral
+add-highlighter shared/zig/code/ regex \b0o[0-7]+ 0:value # octal numeral
+add-highlighter shared/zig/code/ regex \b0b[01]+(?:.[01]\+(?:[eE][+-]?[0-9]+)?)?" 0:value # binary numeral
+
+add-highlighter shared/zig/code/ regex @(addWithOverflow|alignCast|alignOf|ArgType|atomicLoad|atomicRmw|bitCast|bitOffsetOf|boolToInt|breakpoint|bswap|bitreverse|byteOffsetOf|bytesToSlice|cDefine|cImport|cInclude|clz|cmpxchgStrong|cmpxchgWeak|compileError|compileLog|ctz|cUndef|divExact|divFloor|divTrunc|embedFile|enumToInt|errorName|errorReturnTrace|errorToInt|errSetCast|export|fence|field|fieldParentPtr|floatCast|floatToInt|frameAddress|handle|import|inlineCall|intCast|intToEnum|intToError|intToFloat|intToPtr|IntType|memberCount|memberName|memberType|memcpy|memset|mod|mulWithOverflow|newStackCall|noInlineCall|OpaqueType|panic|popCount|ptrCast|ptrToInt|rem|returnAddress|setAlignStack|setCold|setEvalBranchQuota|setFloatMode|setGlobalLinkage|setRuntimeSafety|shlExact|shlWithOverflow|shrExact|sizeOf|sliceToBytes|sqrt|subWithOverflow|tagName|TagType|This|truncate|typeId|typeInfo|typeName|typeOf|Vector)\b 0:builtin
+
+add-highlighter shared/zig/code/ regex ((\+|-|\*|<<)%?|/|=|\^|&|\?|\||!|>|<|%|>>)=? 0:operator
+add-highlighter shared/zig/code/ regex -> 0:operator
+
+# Commands
+
+define-command -hidden zig-filter-around-selections %{
+    # remove trailing whitspace
+    try %{ execute-keys -draft -itersel <a-x> s\h+$<ret> d }
+}
+
+define-command -hidden zig-indent-on-new-line %[
+    evaluate-commands -draft -itersel %[
+        # copy comment prefix //
+        try %{ execute-keys -draft k <a-x> s^\h*\K///?\h*<ret> y gh j P }
+        # preserve indent
+        try %{ execute-keys -draft ';' K <a-&> }
+        # filter previous line
+        try %{ execute-keys -draft k :zig-filter-around-selections<ret> }
+        # indent after lines ending with { or (
+        try %[ execute-keys -draft k <a-x> <a-k>[{(]\h*$<ret> j <a-gt> ]
+    ]
+]
+
+define-command -hidden zig-indent-on-closing-curly-brace %[
+    evaluate-commands -draft -itersel %[
+        # align to opening brace when the closing brace is the only thing on this line
+        try %[ execute-keys -draft <a-h> <a-k>^\h+\}$<ret> h m s\A|.\z<ret> 1<a-&> ]
+    ]
+]
+
+# Initialization
+
+hook -group zig-highlight global WinSetOption filetype=zig %{
+    add-highlighter window/zig ref zig
+
+    hook -once -always window WinSetOption filetype=.* %{
+        remove-highlighter window/zig
+    }
+}
+
+hook global WinSetOption filetype=zig %[
+    set-option buffer comment_line '//'
+    hook -group zig-hooks window ModeChange insert:.* zig-filter-around-selections
+    hook -group zig-indent window InsertChar \n zig-indent-on-new-line
+    hook -group zig-indent window InsertChar \} zig-indent-on-closing-curly-brace
+
+    hook -once -always window WinSetOption filetype=.* %{
+        remove-hooks window zig-.+
+    }
+]

@@ 59,7 59,7 @@ define-command latex-preview %{
 #                   |_|                      
 
 filetype-hook html|markdown|ocaml|gas|nim|latex %{ indent-spaces 2 }
-filetype-hook zig|javascript|haskell|python|rust|kak|c|fish %{ indent-spaces 4 }
+filetype-hook zig|javascript|haskell|python|rust|kak|c|fish|json %{ indent-spaces 4 }
 filetype-hook css %{ indent-tabs 4 }
 
 hook global WinCreate ^[^*]+$ %{


@@ 94,6 94,7 @@ filetype-hook markdown %{
 }
 
 
+
 #  __  __                _              
 # |  \/  |__ _ _ __ _ __(_)_ _  __ _ ___
 # | |\/| / _` | '_ \ '_ \ | ' \/ _` (_-<