diff --git a/rc/filetype/go.kak b/rc/filetype/go.kak index ef5fa62e5..4f8407cdb 100644 --- a/rc/filetype/go.kak +++ b/rc/filetype/go.kak @@ -105,20 +105,20 @@ define-command -hidden go-indent-on-new-line %~ try %{ execute-keys -draft K } # cleanup trailing white spaces on the previous line try %{ execute-keys -draft kx s \h+$ d } - try %{ + try %< try %{ # line comment execute-keys -draft kx s ^\h*// } catch %{ # block comment execute-keys -draft /\* \*/ } - } catch %{ + > catch %< # indent after lines with an unclosed { or ( try %< execute-keys -draft [c[({],[)}] \A[({][^\n]*\n[^\n]*\n?\z j > # indent after a switch's case/default statements try %[ execute-keys -draft kx ^\h*(case|default).*:$ j ] # deindent closing brace(s) when after cursor try %[ execute-keys -draft x ^\h*[})] gh / [})] m 1 ] - } + > = ~ diff --git a/rc/filetype/hare.kak b/rc/filetype/hare.kak index aebb733df..19c229646 100644 --- a/rc/filetype/hare.kak +++ b/rc/filetype/hare.kak @@ -99,7 +99,7 @@ provide-module hare %§ add-highlighter shared/hare/code/ regex "(=|\+|-|\*|/|<|>|!|\?|&|\||\.\.(\.)?)" 0:operator # commands - 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 try %{ execute-keys -draft K } # indent after lines ending with { or ( @@ -110,7 +110,7 @@ provide-module hare %§ try %[ execute-keys -draft kx case\h.*=>\h*$ j ] # deindent closing brace(s) when after cursor try %[ execute-keys -draft x ^\h*[})] gh / [})] m 1 ] - } } + ] ] define-command -hidden hare-insert-on-new-line %{ evaluate-commands -draft -itersel %{ try %{ evaluate-commands -draft -save-regs '/"' %{ diff --git a/rc/filetype/markdown.kak b/rc/filetype/markdown.kak index 2a5755b9f..b5159099c 100644 --- a/rc/filetype/markdown.kak +++ b/rc/filetype/markdown.kak @@ -93,7 +93,7 @@ add-highlighter shared/markdown/inline/text/ regex "\H( {2,})$" 1:+r@meta define-command markdown-load-languages -params 1 %{ evaluate-commands -draft %{ try %{ - execute-keys "%arg{1}s```\h*\{?[.=]?\K\w+" # } + execute-keys "%arg{1}1s```\h*\{?[.=]?(\w+)\}?" evaluate-commands -itersel %{ try %{ require-module %val{selection} add-highlighter "shared/markdown/codeblock/%val{selection}" region -match-capture "^(\h*)```\h*(%val{selection}\b|\{[.=]?%val{selection}\})" ^(\h*)``` regions