diff options
| author | Maxime Coste <mawww@kakoune.org> | 2024-02-10 21:59:38 +1100 |
|---|---|---|
| committer | Maxime Coste <mawww@kakoune.org> | 2024-02-10 21:59:38 +1100 |
| commit | 8d60e19484d9cd5a49ed6d84c84f522092601d9f (patch) | |
| tree | a865978bab46ce673348b3ad8e589739a691a21f /rc | |
| parent | cf95043b1420b9dfdd667eb64485ae705c41bf8d (diff) | |
| parent | ca503797715305624a50d92fbb9447cf68912281 (diff) | |
Merge remote-tracking branch 'arachsys/balance'
Diffstat (limited to 'rc')
| -rw-r--r-- | rc/filetype/go.kak | 6 | ||||
| -rw-r--r-- | rc/filetype/hare.kak | 4 | ||||
| -rw-r--r-- | rc/filetype/markdown.kak | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/rc/filetype/go.kak b/rc/filetype/go.kak index ef5fa62e..4f8407cd 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 <semicolon>K<a-&> } # cleanup trailing white spaces on the previous line try %{ execute-keys -draft kx s \h+$ <ret>d } - try %{ + try %< try %{ # line comment execute-keys -draft kx s ^\h*// <ret> } catch %{ # block comment execute-keys -draft <a-?> /\* <ret> <a-K>\*/<ret> } - } catch %{ + > catch %< # indent after lines with an unclosed { or ( try %< execute-keys -draft [c[({],[)}] <ret> <a-k> \A[({][^\n]*\n[^\n]*\n?\z <ret> j<a-gt> > # indent after a switch's case/default statements try %[ execute-keys -draft kx <a-k> ^\h*(case|default).*:$ <ret> j<a-gt> ] # deindent closing brace(s) when after cursor try %[ execute-keys -draft x <a-k> ^\h*[})] <ret> gh / [})] <ret> m <a-S> 1<a-&> ] - } + > = ~ diff --git a/rc/filetype/hare.kak b/rc/filetype/hare.kak index aebb733d..19c22964 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 <semicolon> K <a-&> } # indent after lines ending with { or ( @@ -110,7 +110,7 @@ provide-module hare %§ try %[ execute-keys -draft kx <a-k> case\h.*=>\h*$ <ret> j<a-gt> ] # deindent closing brace(s) when after cursor try %[ execute-keys -draft x <a-k> ^\h*[})] <ret> gh / [})] <ret> m <a-S> 1<a-&> ] - } } + ] ] 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 2a5755b9..b5159099 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+<ret>" # } + execute-keys "%arg{1}1s```\h*\{?[.=]?(\w+)\}?<ret>" 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 |