diff --git a/rc/base/autowrap.kak b/rc/base/autowrap.kak index 85a50db0..1f8ef8be 100644 --- a/rc/base/autowrap.kak +++ b/rc/base/autowrap.kak @@ -8,16 +8,16 @@ declare-option -docstring %{command to which the paragraphs to wrap will be pass all occurences of '%c' are replaced with `autowrap_column`} \ str autowrap_fmtcmd 'fold -s -w %c' -define-command -hidden autowrap-cursor %{ eval -save-regs '/"|^@m' %{ +define-command -hidden autowrap-cursor %{ evaluate-commands -save-regs '/"|^@m' %{ try %{ ## if the line isn't too long, do nothing - exec -draft "^[^\n]{%opt{autowrap_column},}[^\n]" + execute-keys -draft "^[^\n]{%opt{autowrap_column},}[^\n]" try %{ reg m "%val{selections_desc}" ## if we're adding characters past the limit, just wrap them around - exec -draft ".{%opt{autowrap_column}}\h*[^\s]*1s(\h+)[^\h]*\zc" + execute-keys -draft ".{%opt{autowrap_column}}\h*[^\s]*1s(\h+)[^\h]*\zc" } catch %{ ## if we're adding characters in the middle of a sentence, use ## the `fmtcmd` command to wrap the entire paragraph @@ -27,9 +27,9 @@ define-command -hidden autowrap-cursor %{ eval -save-regs '/"|^@m' %{ format_cmd=$(printf %s "${kak_opt_autowrap_fmtcmd}" \ | sed "s/%c/${kak_opt_autowrap_column}/g") printf %s " - eval -draft %{ - exec 'p|${format_cmd}' - try %{ exec s\h+$ d } + evaluate-commands -draft %{ + execute-keys 'p|${format_cmd}' + try %{ execute-keys s\h+$ d } } select '${kak_reg_m}' " diff --git a/rc/base/css.kak b/rc/base/css.kak index e6e66d12..73695397 100644 --- a/rc/base/css.kak +++ b/rc/base/css.kak @@ -40,24 +40,24 @@ add-highlighter shared/css/selector regex [*]|[#.][A-Za-z][A-Za-z0-9_-]* 0:varia define-command -hidden css-filter-around-selections %{ # remove trailing white spaces - try %{ exec -draft -itersel s \h+$ d } + try %{ execute-keys -draft -itersel s \h+$ d } } define-command -hidden css-indent-on-new-line %[ - eval -draft -itersel %[ + evaluate-commands -draft -itersel %[ # preserve previous line indent - try %[ exec -draft \; K ] + try %[ execute-keys -draft \; K ] # filter previous line - try %[ exec -draft k : css-filter-around-selections ] + try %[ execute-keys -draft k : css-filter-around-selections ] # indent after lines ending with with { - try %[ exec -draft k \{$ j ] + try %[ execute-keys -draft k \{$ j ] ] ] define-command -hidden css-indent-on-closing-curly-brace %[ - eval -draft -itersel %[ + evaluate-commands -draft -itersel %[ # align to opening curly brace when alone on a line - try %[ exec -draft ^\h+\}$ m s \A|.\z 1 ] + try %[ execute-keys -draft ^\h+\}$ m s \A|.\z 1 ] ] ] diff --git a/rc/base/ctags.kak b/rc/base/ctags.kak index b779e710..1e68fc30 100644 --- a/rc/base/ctags.kak +++ b/rc/base/ctags.kak @@ -37,14 +37,14 @@ If no symbol is passed then the current selection is used as symbol name} \ re=$0; sub(".*\t/\\^", "", re); sub("\\$?/$", "", re); gsub("(\\{|\\}|\\\\E).*$", "", re); keys=re; gsub(/", keys); gsub(/\t/, "", keys); - out = out " %{" $2 " {MenuInfo}" re "} %{eval -collapse-jumps %{ try %{ edit %{" tagroot $2 "}; exec %{/\\Q" keys "vc} } catch %{ echo %{unable to find tag} } } }" + out = out " %{" $2 " {MenuInfo}" re "} %{evaluate-commands -collapse-jumps %{ try %{ edit %{" tagroot $2 "}; execute-keys %{/\\Q" keys "vc} } catch %{ echo %{unable to find tag} } } }" } - /[^\t]+\t[^\t]+\t[0-9]+/ { out = out " %{" $2 ":" $3 "} %{eval -collapse-jumps %{ edit %{" tagroot $2 "} %{" $3 "}}}" } + /[^\t]+\t[^\t]+\t[0-9]+/ { out = out " %{" $2 ":" $3 "} %{evaluate-commands -collapse-jumps %{ edit %{" tagroot $2 "} %{" $3 "}}}" } END { print ( length(out) == 0 ? "echo -markup %{{Error}no such tag " ENVIRON["tagname"] "}" : "menu -markup -auto-single " out ) }' }} -define-command ctags-complete -docstring "Insert completion candidates for the current selection into the buffer's local variables" %{ eval -draft %{ - exec hb^\w+$ +define-command ctags-complete -docstring "Insert completion candidates for the current selection into the buffer's local variables" %{ evaluate-commands -draft %{ + execute-keys hb^\w+$ %sh{ { compl=$(readtags -p "$kak_selection" | cut -f 1 | sort | uniq | sed -e 's/:/\\:/g' | sed -e 's/\n/:/g' ) compl="${kak_cursor_line}.${kak_cursor_column}+${#kak_selection}@${kak_timestamp}:${compl}" @@ -53,13 +53,13 @@ define-command ctags-complete -docstring "Insert completion candidates for the c }} define-command ctags-funcinfo -docstring "Display ctags information about a selected function" %{ - eval -draft %{ + evaluate-commands -draft %{ try %{ - exec -no-hooks '[(;B[a-zA-Z_]+\(' + execute-keys -no-hooks '[(;B[a-zA-Z_]+\(' %sh{ sigs=$(readtags -e ${kak_selection%(} | grep kind:f | sed -re 's/^(\S+).*((class|struct|namespace):(\S+))?.*signature:(.*)$/\5 [\4::\1]/') if [ -n "$sigs" ]; then - printf %s\\n "eval -client ${kak_client} %{info -anchor $kak_cursor_line.$kak_cursor_column -placement above '$sigs'}" + printf %s\\n "evaluate-commands -client ${kak_client} %{info -anchor $kak_cursor_line.$kak_cursor_column -placement above '$sigs'}" fi } } @@ -90,7 +90,7 @@ define-command ctags-generate -docstring 'Generate tag file asynchronously' %{ msg="tags generation failed" fi - printf %s\\n "eval -client $kak_client echo -markup '{Information}${msg}'" | kak -p ${kak_session} + printf %s\\n "evaluate-commands -client $kak_client echo -markup '{Information}${msg}'" | kak -p ${kak_session} } > /dev/null 2>&1 < /dev/null & } } @@ -110,6 +110,6 @@ define-command ctags-update-tags -docstring 'Update tags for the given file' %{ msg="tags update failed for $kak_bufname" fi - printf %s\\n "eval -client $kak_client echo -markup '{Information}${msg}'" | kak -p ${kak_session} + printf %s\\n "evaluate-commands -client $kak_client echo -markup '{Information}${msg}'" | kak -p ${kak_session} } > /dev/null 2>&1 < /dev/null & } } diff --git a/rc/base/d.kak b/rc/base/d.kak index 3656559c..4f245f8e 100644 --- a/rc/base/d.kak +++ b/rc/base/d.kak @@ -82,32 +82,32 @@ add-highlighter shared/d/code regex "\b(this)\b\s*[^(]" 1:value # ‾‾‾‾‾‾‾‾ define-command -hidden d-indent-on-new-line %~ - eval -draft -itersel %= + evaluate-commands -draft -itersel %= # preserve previous line indent - try %{ exec -draft \;K } + try %{ execute-keys -draft \;K } # indent after lines ending with { or ( - try %[ exec -draft k [{(]\h*$ j ] + try %[ execute-keys -draft k [{(]\h*$ j ] # cleanup trailing white spaces on the previous line - try %{ exec -draft k s \h+$ d } + try %{ execute-keys -draft k s \h+$ d } # align to opening paren of previous line - try %{ exec -draft [( \A\([^\n]+\n[^\n]*\n?\z s \A\(\h*.|.\z '' & } + try %{ execute-keys -draft [( \A\([^\n]+\n[^\n]*\n?\z s \A\(\h*.|.\z '' & } # copy // comments prefix - try %{ exec -draft \;k s ^\h*\K/{2,} yP } + try %{ execute-keys -draft \;k s ^\h*\K/{2,} yP } # indent after a switch's case/default statements - try %[ exec -draft k ^\h*(case|default).*:$ j ] + try %[ execute-keys -draft k ^\h*(case|default).*:$ j ] # indent after if|else|while|for - try %[ exec -draft \;)MB \A(if|else|while|for)\h*\(.*\)\h*\n\h*\n?\z s \A|.\z 11 ] + try %[ execute-keys -draft \;)MB \A(if|else|while|for)\h*\(.*\)\h*\n\h*\n?\z s \A|.\z 11 ] = ~ define-command -hidden d-indent-on-opening-curly-brace %[ # align indent with opening paren when { is entered on a new line after the closing paren - try %[ exec -draft -itersel h)M \A\(.*\)\h*\n\h*\{\z s \A|.\z 1 ] + try %[ execute-keys -draft -itersel h)M \A\(.*\)\h*\n\h*\{\z s \A|.\z 1 ] ] define-command -hidden d-indent-on-closing-curly-brace %[ # align to opening curly brace when alone on a line - try %[ exec -itersel -draft ^\h+\}$hms\A|.\z1 ] + try %[ execute-keys -itersel -draft ^\h+\}$hms\A|.\z1 ] ] # Initialization @@ -117,7 +117,7 @@ hook -group d-highlight global WinSetOption filetype=d %{ add-highlighter window hook global WinSetOption filetype=d %{ # cleanup trailing whitespaces when exiting insert mode - hook window InsertEnd .* -group d-hooks %{ try %{ exec -draft s^\h+$d } } + hook window InsertEnd .* -group d-hooks %{ try %{ execute-keys -draft s^\h+$d } } hook window InsertChar \n -group d-indent d-indent-on-new-line hook window InsertChar \{ -group d-indent d-indent-on-opening-curly-brace hook window InsertChar \} -group d-indent d-indent-on-closing-curly-brace diff --git a/rc/base/fish.kak b/rc/base/fish.kak index cd78589f..4eb82b79 100644 --- a/rc/base/fish.kak +++ b/rc/base/fish.kak @@ -30,40 +30,40 @@ add-highlighter shared/fish/code regex \b(and|begin|bg|bind|block|break|breakpoi # ‾‾‾‾‾‾‾‾ define-command -hidden fish-filter-around-selections %{ - eval -no-hooks -draft -itersel %{ + evaluate-commands -no-hooks -draft -itersel %{ # remove trailing white spaces - try %{ exec -draft s\h+$d } + try %{ execute-keys -draft s\h+$d } } } define-command -hidden fish-indent-on-char %{ - eval -no-hooks -draft -itersel %{ + evaluate-commands -no-hooks -draft -itersel %{ # align middle and end structures to start and indent when necessary - try %{ exec -draft ^\h*(else)$^\h*(if)s\A|\z' } - try %{ exec -draft ^\h*(end)$^\h*(begin|for|function|if|switch|while)s\A|\z' } - try %{ exec -draft ^\h*(case)$^\h*(switch)s\A|\z'' } + try %{ execute-keys -draft ^\h*(else)$^\h*(if)s\A|\z' } + try %{ execute-keys -draft ^\h*(end)$^\h*(begin|for|function|if|switch|while)s\A|\z' } + try %{ execute-keys -draft ^\h*(case)$^\h*(switch)s\A|\z'' } } } define-command -hidden fish-indent-on-new-line %{ - eval -no-hooks -draft -itersel %{ + evaluate-commands -no-hooks -draft -itersel %{ # preserve previous line indent - try %{ exec -draft K } + try %{ execute-keys -draft K } # filter previous line - try %{ exec -draft k:fish-filter-around-selections } + try %{ execute-keys -draft k:fish-filter-around-selections } # indent after start structure - try %{ exec -draft k^\h*(begin|case|else|for|function|if|switch|while)\bj } + try %{ execute-keys -draft k^\h*(begin|case|else|for|function|if|switch|while)\bj } } } define-command -hidden fish-insert-on-new-line %{ - eval -no-hooks -draft -itersel %{ + evaluate-commands -no-hooks -draft -itersel %{ # copy _#_ comment prefix and following white spaces - try %{ exec -draft ks^\h*\K#\h*yjp } + try %{ execute-keys -draft ks^\h*\K#\h*yjp } # wisely add end structure - eval -save-regs x %{ - try %{ exec -draft ks^\h+"xy } catch %{ reg x '' } - try %{ exec -draft k^x(begin|for|function|if|switch|while)jiXK^x(begin|for|function|if|switch|while).*\nxend$jxypjaend } + evaluate-commands -save-regs x %{ + try %{ execute-keys -draft ks^\h+"xy } catch %{ reg x '' } + try %{ execute-keys -draft k^x(begin|for|function|if|switch|while)jiXK^x(begin|for|function|if|switch|while).*\nxend$jxypjaend } } } } diff --git a/rc/base/gas.kak b/rc/base/gas.kak index 4c9c12c1..8c4dcef6 100644 --- a/rc/base/gas.kak +++ b/rc/base/gas.kak @@ -67,21 +67,21 @@ add-highlighter shared/gas/code regex \ ^\h*(vxorp[sd]|vandp[sd]|ucomis[sd])\b 0:keyword define-command -hidden gas-filter-around-selections %{ - eval -draft -itersel %{ - exec + evaluate-commands -draft -itersel %{ + execute-keys # remove trailing white spaces - try %{ exec -draft s \h+$ d } + try %{ execute-keys -draft s \h+$ d } } } define-command -hidden gas-indent-on-new-line %~ - eval -draft -itersel %< + evaluate-commands -draft -itersel %< # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # filter previous line - try %{ exec -draft k : gas-filter-around-selections } + try %{ execute-keys -draft k : gas-filter-around-selections } # indent after label - try %[ exec -draft k :$ j ] + try %[ execute-keys -draft k :$ j ] > ~ diff --git a/rc/base/go.kak b/rc/base/go.kak index 9c10534b..b37d813b 100644 --- a/rc/base/go.kak +++ b/rc/base/go.kak @@ -54,32 +54,32 @@ add-highlighter shared/go/code regex %{-?([0-9]*\.(?!0[xX]))?\b([0-9]+|0[xX][0-9 # ‾‾‾‾‾‾‾‾ define-command -hidden go-indent-on-new-line %~ - eval -draft -itersel %= + evaluate-commands -draft -itersel %= # preserve previous line indent - try %{ exec -draft \;K } + try %{ execute-keys -draft \;K } # indent after lines ending with { or ( - try %[ exec -draft k [{(]\h*$ j ] + try %[ execute-keys -draft k [{(]\h*$ j ] # cleanup trailing white spaces on the previous line - try %{ exec -draft k s \h+$ d } + try %{ execute-keys -draft k s \h+$ d } # align to opening paren of previous line - try %{ exec -draft [( \A\([^\n]+\n[^\n]*\n?\z s \A\(\h*.|.\z '' & } + try %{ execute-keys -draft [( \A\([^\n]+\n[^\n]*\n?\z s \A\(\h*.|.\z '' & } # copy // comments prefix - try %{ exec -draft \;k s ^\h*\K/{2,} yP } + try %{ execute-keys -draft \;k s ^\h*\K/{2,} yP } # indent after a switch's case/default statements - try %[ exec -draft k ^\h*(case|default).*:$ j ] + try %[ execute-keys -draft k ^\h*(case|default).*:$ j ] # indent after if|else|while|for - try %[ exec -draft \;)MB \A(if|else|while|for)\h*\(.*\)\h*\n\h*\n?\z s \A|.\z 11 ] + try %[ execute-keys -draft \;)MB \A(if|else|while|for)\h*\(.*\)\h*\n\h*\n?\z s \A|.\z 11 ] = ~ define-command -hidden go-indent-on-opening-curly-brace %[ # align indent with opening paren when { is entered on a new line after the closing paren - try %[ exec -draft -itersel h)M \A\(.*\)\h*\n\h*\{\z s \A|.\z 1 ] + try %[ execute-keys -draft -itersel h)M \A\(.*\)\h*\n\h*\{\z s \A|.\z 1 ] ] define-command -hidden go-indent-on-closing-curly-brace %[ # align to opening curly brace when alone on a line - try %[ exec -itersel -draft ^\h+\}$hms\A|.\z1 ] + try %[ execute-keys -itersel -draft ^\h+\}$hms\A|.\z1 ] ] # Initialization @@ -89,7 +89,7 @@ hook -group go-highlight global WinSetOption filetype=go %{ add-highlighter wind hook global WinSetOption filetype=go %{ # cleanup trailing whitespaces when exiting insert mode - hook window InsertEnd .* -group go-hooks %{ try %{ exec -draft s^\h+$d } } + hook window InsertEnd .* -group go-hooks %{ try %{ execute-keys -draft s^\h+$d } } 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-closing-curly-brace diff --git a/rc/base/haskell.kak b/rc/base/haskell.kak index 3003e7ec..b5e60c30 100644 --- a/rc/base/haskell.kak +++ b/rc/base/haskell.kak @@ -74,21 +74,21 @@ add-highlighter shared/haskell/code regex \B'([^\\]|[\\]['"\w\d\\])' 0:string define-command -hidden haskell-filter-around-selections %{ # remove trailing white spaces - try %{ exec -draft -itersel s \h+$ d } + try %{ execute-keys -draft -itersel s \h+$ d } } define-command -hidden haskell-indent-on-new-line %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # copy -- comments prefix and following white spaces - try %{ exec -draft k s ^\h*\K--\h* y gh j P } + try %{ execute-keys -draft k s ^\h*\K--\h* y gh j P } # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # align to first clause - try %{ exec -draft \; k x X s ^\h*(if|then|else)?\h*(([\w']+\h+)+=)?\h*(case\h+[\w']+\h+of|do|let|where)\h+\K.* s \A|.\z & } + try %{ execute-keys -draft \; k x X s ^\h*(if|then|else)?\h*(([\w']+\h+)+=)?\h*(case\h+[\w']+\h+of|do|let|where)\h+\K.* s \A|.\z & } # filter previous line - try %{ exec -draft k : haskell-filter-around-selections } + try %{ execute-keys -draft k : haskell-filter-around-selections } # indent after lines beginning with condition or ending with expression or =( - try %{ exec -draft \; k x ^\h*(if)|(case\h+[\w']+\h+of|do|let|where|[=(])$ j } + try %{ execute-keys -draft \; k x ^\h*(if)|(case\h+[\w']+\h+of|do|let|where|[=(])$ j } } } diff --git a/rc/base/html.kak b/rc/base/html.kak index e6ab2640..e4f465ca 100644 --- a/rc/base/html.kak +++ b/rc/base/html.kak @@ -41,24 +41,24 @@ add-highlighter shared/html/tag/content/string fill string define-command -hidden html-filter-around-selections %{ # remove trailing white spaces - try %{ exec -draft -itersel s \h+$ d } + try %{ execute-keys -draft -itersel s \h+$ d } } define-command -hidden html-indent-on-greater-than %[ - eval -draft -itersel %[ + evaluate-commands -draft -itersel %[ # align closing tag to opening when alone on a line - try %[ exec -draft s ^\h+/(\w+)$ {c1,/1 s \A|.\z 1 ] + try %[ execute-keys -draft s ^\h+/(\w+)$ {c1,/1 s \A|.\z 1 ] ] ] define-command -hidden html-indent-on-new-line %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # filter previous line - try %{ exec -draft k : html-filter-around-selections } + try %{ execute-keys -draft k : html-filter-around-selections } # indent after lines ending with opening tag - try %{ exec -draft k <[^/][^>]+>$ j } + try %{ execute-keys -draft k <[^/][^>]+>$ j } } } diff --git a/rc/base/java.kak b/rc/base/java.kak index 7534b858..2d107e43 100644 --- a/rc/base/java.kak +++ b/rc/base/java.kak @@ -19,39 +19,39 @@ add-highlighter shared/java/code regex "\b(final|public|protected|private|abstra # ‾‾‾‾‾‾‾‾ define-command -hidden java-indent-on-new-line %~ - eval -draft -itersel %= + evaluate-commands -draft -itersel %= # preserve previous line indent - try %{ exec -draft \;K } + try %{ execute-keys -draft \;K } # indent after lines ending with { or ( - try %[ exec -draft k [{(]\h*$ j ] + try %[ execute-keys -draft k [{(]\h*$ j ] # cleanup trailing white spaces on the previous line - try %{ exec -draft k s \h+$ d } + try %{ execute-keys -draft k s \h+$ d } # align to opening paren of previous line - try %{ exec -draft [( \A\([^\n]+\n[^\n]*\n?\z s \A\(\h*.|.\z '' & } + try %{ execute-keys -draft [( \A\([^\n]+\n[^\n]*\n?\z s \A\(\h*.|.\z '' & } # copy // comments prefix - try %{ exec -draft \;k s ^\h*\K/{2,} yP } + try %{ execute-keys -draft \;k s ^\h*\K/{2,} yP } # indent after a switch's case/default statements - try %[ exec -draft k ^\h*(case|default).*:$ j ] + try %[ execute-keys -draft k ^\h*(case|default).*:$ j ] # indent after keywords - try %[ exec -draft \;)MB \A(if|else|while|for|try|catch)\h*\(.*\)\h*\n\h*\n?\z s \A|.\z 11 ] + try %[ execute-keys -draft \;)MB \A(if|else|while|for|try|catch)\h*\(.*\)\h*\n\h*\n?\z s \A|.\z 11 ] = ~ define-command -hidden java-indent-on-opening-curly-brace %[ # align indent with opening paren when { is entered on a new line after the closing paren - try %[ exec -draft -itersel h)M \A\(.*\)\h*\n\h*\{\z s \A|.\z 1 ] + try %[ execute-keys -draft -itersel h)M \A\(.*\)\h*\n\h*\{\z s \A|.\z 1 ] ] define-command -hidden java-indent-on-closing-curly-brace %[ # align to opening curly brace when alone on a line - try %[ exec -itersel -draft ^\h+\}$hms\A|.\z1 ] + try %[ execute-keys -itersel -draft ^\h+\}$hms\A|.\z1 ] ] # Initialization # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾ hook global WinSetOption filetype=java %{ # cleanup trailing whitespaces when exiting insert mode - hook window InsertEnd .* -group java-hooks %{ try %{ exec -draft s^\h+$d } } + hook window InsertEnd .* -group java-hooks %{ try %{ execute-keys -draft s^\h+$d } } hook window InsertChar \n -group java-indent java-indent-on-new-line hook window InsertChar \{ -group java-indent java-indent-on-opening-curly-brace hook window InsertChar \} -group java-indent java-indent-on-closing-curly-brace diff --git a/rc/base/javascript.kak b/rc/base/javascript.kak index 963b137e..6f4a7a2b 100644 --- a/rc/base/javascript.kak +++ b/rc/base/javascript.kak @@ -41,26 +41,26 @@ add-highlighter shared/javascript/code regex \b(async|await|break|case|catch|cla define-command -hidden javascript-filter-around-selections %{ # remove trailing white spaces - try %{ exec -draft -itersel s \h+$ d } + try %{ execute-keys -draft -itersel s \h+$ d } } define-command -hidden javascript-indent-on-char %< - eval -draft -itersel %< + evaluate-commands -draft -itersel %< # align closer token to its opener when alone on a line - try %/ exec -draft ^\h+[]}]$ m s \A|.\z 1 / + try %/ execute-keys -draft ^\h+[]}]$ m s \A|.\z 1 / > > define-command -hidden javascript-indent-on-new-line %< - eval -draft -itersel %< + evaluate-commands -draft -itersel %< # copy // comments prefix and following white spaces - try %{ exec -draft k s ^\h*\K#\h* y gh j P } + try %{ execute-keys -draft k s ^\h*\K#\h* y gh j P } # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # filter previous line - try %{ exec -draft k : javascript-filter-around-selections } + try %{ execute-keys -draft k : javascript-filter-around-selections } # indent after lines beginning / ending with opener token - try %_ exec -draft k ^\h*[[{]|[[{]$ j _ + try %_ execute-keys -draft k ^\h*[[{]|[[{]$ j _ > > diff --git a/rc/base/json.kak b/rc/base/json.kak index 75a65db8..c53193d0 100644 --- a/rc/base/json.kak +++ b/rc/base/json.kak @@ -23,24 +23,24 @@ add-highlighter shared/json/code regex \b(true|false|null|\d+(?:\.\d+)?(?:[eE][+ define-command -hidden json-filter-around-selections %{ # remove trailing white spaces - try %{ exec -draft -itersel s \h+$ d } + try %{ execute-keys -draft -itersel s \h+$ d } } define-command -hidden json-indent-on-char %< - eval -draft -itersel %< + evaluate-commands -draft -itersel %< # align closer token to its opener when alone on a line - try %< exec -draft ^\h+[]}]$ m s \A|.\z 1 > + try %< execute-keys -draft ^\h+[]}]$ m s \A|.\z 1 > > > define-command -hidden json-indent-on-new-line %< - eval -draft -itersel %< + evaluate-commands -draft -itersel %< # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # filter previous line - try %{ exec -draft k : json-filter-around-selections } + try %{ execute-keys -draft k : json-filter-around-selections } # indent after lines beginning with opener token - try %< exec -draft k ^\h*[[{] j > + try %< execute-keys -draft k ^\h*[[{] j > > > diff --git a/rc/base/lint.kak b/rc/base/lint.kak index de17e557..51afd2e2 100644 --- a/rc/base/lint.kak +++ b/rc/base/lint.kak @@ -10,9 +10,9 @@ define-command lint -docstring 'Parse the current buffer with a linter' %{ %sh{ dir=$(mktemp -d "${TMPDIR:-/tmp}"/kak-lint.XXXXXXXX) mkfifo "$dir"/fifo - printf '%s\n' "eval -no-hooks write $dir/buf" + printf '%s\n' "evaluate-commands -no-hooks write $dir/buf" - printf '%s\n' "eval -draft %{ + printf '%s\n' "evaluate-commands -draft %{ edit! -fifo $dir/fifo -debug *lint-output* set-option buffer filetype make set-option buffer make_current_error_line 0 @@ -24,8 +24,8 @@ define-command lint -docstring 'Parse the current buffer with a linter' %{ { # do the parsing in the background and when ready send to the session - eval "$kak_opt_lintcmd '$dir'/buf" | sort -t: -k2,2 -n > "$dir"/stderr - printf '%s\n' "eval -client $kak_client echo 'linting done'" | kak -p "$kak_session" + evaluate-commands "$kak_opt_lintcmd '$dir'/buf" | sort -t: -k2,2 -n > "$dir"/stderr + printf '%s\n' "evaluate-commands -client $kak_client echo 'linting done'" | kak -p "$kak_session" # Flags for the gutter: # line3|{red}:line11|{yellow} diff --git a/rc/base/lisp.kak b/rc/base/lisp.kak index 3d6c6bc7..c85b39bf 100644 --- a/rc/base/lisp.kak +++ b/rc/base/lisp.kak @@ -28,15 +28,15 @@ add-highlighter shared/lisp/code regex \b(def[a-z]+|if|do|let|lambda|catch|and|a define-command -hidden lisp-filter-around-selections %{ # remove trailing white spaces - try %{ exec -draft -itersel s \h+$ d } + try %{ execute-keys -draft -itersel s \h+$ d } } define-command -hidden lisp-indent-on-new-line %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # indent when matches opening paren - try %{ exec -draft [( \A\([^\n]+\n[^\n]*\n?\z \; } + try %{ execute-keys -draft [( \A\([^\n]+\n[^\n]*\n?\z \; } } } diff --git a/rc/base/lua.kak b/rc/base/lua.kak index ace6d62f..9ec31b93 100644 --- a/rc/base/lua.kak +++ b/rc/base/lua.kak @@ -52,39 +52,39 @@ define-command lua-alternative-file -docstring 'Jump to the alternate file (impl }} define-command -hidden lua-filter-around-selections %{ - eval -no-hooks -draft -itersel %{ + evaluate-commands -no-hooks -draft -itersel %{ # remove trailing white spaces - try %{ exec -draft s\h+$d } + try %{ execute-keys -draft s\h+$d } } } define-command -hidden lua-indent-on-char %{ - eval -no-hooks -draft -itersel %{ + evaluate-commands -no-hooks -draft -itersel %{ # align middle and end structures to start and indent when necessary, elseif is already covered by else - try %{ exec -draft ^\h*(else)$^\h*(if)s\A|\z' } - try %{ exec -draft ^\h*(end)$^\h*(for|function|if|while)s\A|\z' } + try %{ execute-keys -draft ^\h*(else)$^\h*(if)s\A|\z' } + try %{ execute-keys -draft ^\h*(end)$^\h*(for|function|if|while)s\A|\z' } } } define-command -hidden lua-indent-on-new-line %{ - eval -no-hooks -draft -itersel %{ + evaluate-commands -no-hooks -draft -itersel %{ # preserve previous line indent - try %{ exec -draft K } + try %{ execute-keys -draft K } # filter previous line - try %{ exec -draft k:lua-filter-around-selections } + try %{ execute-keys -draft k:lua-filter-around-selections } # indent after start structure - try %{ exec -draft k^\h*(else|elseif|for|function|if|while)\bj } + try %{ execute-keys -draft k^\h*(else|elseif|for|function|if|while)\bj } } } define-command -hidden lua-insert-on-new-line %{ - eval -no-hooks -draft -itersel %{ + evaluate-commands -no-hooks -draft -itersel %{ # copy -- comment prefix and following white spaces - try %{ exec -draft ks^\h*\K--\h*yghjP } + try %{ execute-keys -draft ks^\h*\K--\h*yghjP } # wisely add end structure - eval -save-regs x %{ - try %{ exec -draft ks^\h+"xy } catch %{ reg x '' } - try %{ exec -draft k^x(for|function|if|while)jiXK^x(for|function|if|while).*\nx(else|end|elseif[^\n]*)$jxypjaend } + evaluate-commands -save-regs x %{ + try %{ execute-keys -draft ks^\h+"xy } catch %{ reg x '' } + try %{ execute-keys -draft k^x(for|function|if|while)jiXK^x(for|function|if|while).*\nx(else|end|elseif[^\n]*)$jxypjaend } } } } diff --git a/rc/base/markdown.kak b/rc/base/markdown.kak index f0d35854..0aa09719 100644 --- a/rc/base/markdown.kak +++ b/rc/base/markdown.kak @@ -124,13 +124,13 @@ add-highlighter shared/markdown/content regex \H\K\h\h$ 0:PrimarySelection # ‾‾‾‾‾‾‾‾ define-command -hidden markdown-indent-on-new-line %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # copy block quote(s), list item prefix and following white spaces - try %{ exec -draft k s ^\h*\K((>\h*)+([*+-]\h)?|(>\h*)*[*+-]\h)\h* y gh j P } + try %{ execute-keys -draft k s ^\h*\K((>\h*)+([*+-]\h)?|(>\h*)*[*+-]\h)\h* y gh j P } # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # remove trailing white spaces - try %{ exec -draft -itersel %{ k s \h+$ d } } + try %{ execute-keys -draft -itersel %{ k s \h+$ d } } } } diff --git a/rc/base/ocaml.kak b/rc/base/ocaml.kak index fd3cf362..2e81f20d 100644 --- a/rc/base/ocaml.kak +++ b/rc/base/ocaml.kak @@ -24,8 +24,8 @@ add-highlighter shared/ocaml/comment fill comment # ‾‾‾‾‾‾‾‾ define-command -hidden ocaml-indent-on-char %{ - eval -no-hooks -draft -itersel %{ - exec ";iGg|ocp-indent --config base=%opt{indentwidth} --indent-empty --lines %val{cursor_line}" + evaluate-commands -no-hooks -draft -itersel %{ + execute-keys ";iGg|ocp-indent --config base=%opt{indentwidth} --indent-empty --lines %val{cursor_line}" } } diff --git a/rc/base/perl.kak b/rc/base/perl.kak index 03084dc3..04dc9ec4 100644 --- a/rc/base/perl.kak +++ b/rc/base/perl.kak @@ -71,32 +71,32 @@ add-highlighter shared/perl/code regex \$(LAST_REGEXP_CODE_RESULT|LIST_SEPARATOR # ‾‾‾‾‾‾‾‾ define-command -hidden perl-indent-on-new-line %~ - eval -draft -itersel %= + evaluate-commands -draft -itersel %= # preserve previous line indent - try %{ exec -draft \;K } + try %{ execute-keys -draft \;K } # indent after lines ending with { or ( - try %[ exec -draft k [{(]\h*$ j ] + try %[ execute-keys -draft k [{(]\h*$ j ] # cleanup trailing white spaces on the previous line - try %{ exec -draft k s \h+$ d } + try %{ execute-keys -draft k s \h+$ d } # align to opening paren of previous line - try %{ exec -draft [( \A\([^\n]+\n[^\n]*\n?\z s \A\(\h*.|.\z '' & } + try %{ execute-keys -draft [( \A\([^\n]+\n[^\n]*\n?\z s \A\(\h*.|.\z '' & } # copy // comments prefix - try %{ exec -draft \;k s ^\h*\K/{2,} yP } + try %{ execute-keys -draft \;k s ^\h*\K/{2,} yP } # indent after a switch's case/default statements - try %[ exec -draft k ^\h*(case|default).*:$ j ] + try %[ execute-keys -draft k ^\h*(case|default).*:$ j ] # indent after if|else|while|for - try %[ exec -draft \;)MB \A(if|else|while|for)\h*\(.*\)\h*\n\h*\n?\z s \A|.\z 11 ] + try %[ execute-keys -draft \;)MB \A(if|else|while|for)\h*\(.*\)\h*\n\h*\n?\z s \A|.\z 11 ] = ~ define-command -hidden perl-indent-on-opening-curly-brace %[ # align indent with opening paren when { is entered on a new line after the closing paren - try %[ exec -draft -itersel h)M \A\(.*\)\h*\n\h*\{\' s \A|.\z 1 ] + try %[ execute-keys -draft -itersel h)M \A\(.*\)\h*\n\h*\{\' s \A|.\z 1 ] ] define-command -hidden perl-indent-on-closing-curly-brace %[ # align to opening curly brace when alone on a line - try %[ exec -itersel -draft ^\h+\}$hms\A|.\z1 ] + try %[ execute-keys -itersel -draft ^\h+\}$hms\A|.\z1 ] ] # Initialization @@ -106,7 +106,7 @@ hook -group perl-highlight global WinSetOption filetype=perl %{ add-highlighter hook global WinSetOption filetype=perl %{ # cleanup trailing whitespaces when exiting insert mode - hook window InsertEnd .* -group perl-hooks %{ try %{ exec -draft s^\h+$d } } + hook window InsertEnd .* -group perl-hooks %{ try %{ execute-keys -draft s^\h+$d } } hook window InsertChar \n -group perl-indent perl-indent-on-new-line hook window InsertChar \{ -group perl-indent perl-indent-on-opening-curly-brace hook window InsertChar \} -group perl-indent perl-indent-on-closing-curly-brace diff --git a/rc/base/ruby.kak b/rc/base/ruby.kak index b0d9d969..edd11633 100644 --- a/rc/base/ruby.kak +++ b/rc/base/ruby.kak @@ -101,42 +101,42 @@ define-command ruby-alternative-file -docstring 'Jump to the alternate file (imp }} define-command -hidden ruby-filter-around-selections %{ - eval -no-hooks -draft -itersel %{ - exec + evaluate-commands -no-hooks -draft -itersel %{ + execute-keys # remove trailing white spaces - try %{ exec -draft s \h + $ d } + try %{ execute-keys -draft s \h + $ d } } } define-command -hidden ruby-indent-on-char %{ - eval -no-hooks -draft -itersel %{ + evaluate-commands -no-hooks -draft -itersel %{ # align middle and end structures to start - try %{ exec -draft ^ \h * (else|elsif) $ ^ \h * (if) s \A | \z \' } - try %{ exec -draft ^ \h * (when) $ ^ \h * (case) s \A | \z \' } - try %{ exec -draft ^ \h * (rescue) $ ^ \h * (begin) s \A | \z \' } - try %{ exec -draft ^ \h * (end) $ ^ \h * (begin|case|class|def|do|for|if|module|unless|until|while) s \A | \z \' } + try %{ execute-keys -draft ^ \h * (else|elsif) $ ^ \h * (if) s \A | \z \' } + try %{ execute-keys -draft ^ \h * (when) $ ^ \h * (case) s \A | \z \' } + try %{ execute-keys -draft ^ \h * (rescue) $ ^ \h * (begin) s \A | \z \' } + try %{ execute-keys -draft ^ \h * (end) $ ^ \h * (begin|case|class|def|do|for|if|module|unless|until|while) s \A | \z \' } } } define-command -hidden ruby-indent-on-new-line %{ - eval -no-hooks -draft -itersel %{ + evaluate-commands -no-hooks -draft -itersel %{ # preserve previous line indent - try %{ exec -draft K } + try %{ execute-keys -draft K } # filter previous line - try %{ exec -draft k : ruby-filter-around-selections } + try %{ execute-keys -draft k : ruby-filter-around-selections } # indent after start structure - try %{ exec -draft k ^ \h * (begin|case|class|def|do|else|elsif|ensure|for|if|module|rescue|unless|until|when|while) \b j } + try %{ execute-keys -draft k ^ \h * (begin|case|class|def|do|else|elsif|ensure|for|if|module|rescue|unless|until|when|while) \b j } } } define-command -hidden ruby-insert-on-new-line %{ - eval -no-hooks -draft -itersel %{ + evaluate-commands -no-hooks -draft -itersel %{ # copy _#_ comment prefix and following white spaces - try %{ exec -draft k s '^\h*\K#\h*' y gh j P } + try %{ execute-keys -draft k s '^\h*\K#\h*' y gh j P } # wisely add end structure - eval -save-regs x %{ - try %{ exec -draft k s ^ \h + \" x y } catch %{ reg x '' } - try %{ exec -draft k ^ x (begin|case|class|def|do|for|if|module|unless|until|while) j i X K ^ x (begin|case|class|def|do|for|if|module|unless|until|while) . * \n x end $ j x y p j a end } + evaluate-commands -save-regs x %{ + try %{ execute-keys -draft k s ^ \h + \" x y } catch %{ reg x '' } + try %{ execute-keys -draft k ^ x (begin|case|class|def|do|for|if|module|unless|until|while) j i X K ^ x (begin|case|class|def|do|for|if|module|unless|until|while) . * \n x end $ j x y p j a end } } } } diff --git a/rc/base/rust.kak b/rc/base/rust.kak index f52948e6..d5e7ded0 100644 --- a/rc/base/rust.kak +++ b/rc/base/rust.kak @@ -36,35 +36,35 @@ add-highlighter shared/rust/code regex \b(?:u8|u16|u32|u64|usize|i8|i16|i32|i64| define-command -hidden rust-filter-around-selections %{ # remove trailing white spaces - try %{ exec -draft -itersel s \h+$ d } + try %{ execute-keys -draft -itersel s \h+$ d } } define-command -hidden rust-indent-on-new-line %~ - eval -draft -itersel %< + evaluate-commands -draft -itersel %< # copy // comments prefix and following white spaces - try %{ exec -draft k s ^\h*\K//\h* y gh j P } + try %{ execute-keys -draft k s ^\h*\K//\h* y gh j P } # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # filter previous line - try %{ exec -draft k : rust-filter-around-selections } + try %{ execute-keys -draft k : rust-filter-around-selections } # indent after lines ending with { or ( - try %[ exec -draft k [{(]\h*$ j ] + try %[ execute-keys -draft k [{(]\h*$ j ] # align to opening paren of previous line - try %{ exec -draft [( \A\([^\n]+\n[^\n]*\n?\z s \A\(\h*.|.\z & } + try %{ execute-keys -draft [( \A\([^\n]+\n[^\n]*\n?\z s \A\(\h*.|.\z & } > ~ define-command -hidden rust-indent-on-opening-curly-brace %[ - eval -draft -itersel %_ + evaluate-commands -draft -itersel %_ # align indent with opening paren when { is entered on a new line after the closing paren - try %[ exec -draft h ) M \A\(.*\)\h*\n\h*\{\z s \A|.\z 1 ] + try %[ execute-keys -draft h ) M \A\(.*\)\h*\n\h*\{\z s \A|.\z 1 ] _ ] define-command -hidden rust-indent-on-closing-curly-brace %[ - eval -draft -itersel %_ + evaluate-commands -draft -itersel %_ # align to opening curly brace when alone on a line - try %[ exec -draft ^\h+\}$ h m s \A|.\z 1 ] + try %[ execute-keys -draft ^\h+\}$ h m s \A|.\z 1 ] _ ] diff --git a/rc/base/scala.kak b/rc/base/scala.kak index 8f1b782c..559e58f2 100644 --- a/rc/base/scala.kak +++ b/rc/base/scala.kak @@ -36,26 +36,26 @@ add-highlighter shared/scala/code regex "'[_A-Za-z0-9$]+" 0:variable define-command -hidden scala-filter-around-selections %{ # remove trailing white spaces - try %{ exec -draft -itersel s \h+$ d } + try %{ execute-keys -draft -itersel s \h+$ d } } define-command -hidden scala-indent-on-new-line %[ - eval -draft -itersel %[ + evaluate-commands -draft -itersel %[ # copy // comments prefix and following white spaces - try %[ exec -draft k s ^\h*\K#\h* y gh j P ] + try %[ execute-keys -draft k s ^\h*\K#\h* y gh j P ] # preserve previous line indent - try %[ exec -draft \; K ] + try %[ execute-keys -draft \; K ] # filter previous line - try %[ exec -draft k : scala-filter-around-selections ] + try %[ execute-keys -draft k : scala-filter-around-selections ] # indent after lines ending with { - try %[ exec -draft k \{$ j ] + try %[ execute-keys -draft k \{$ j ] ] ] define-command -hidden scala-indent-on-closing-curly-brace %[ - eval -draft -itersel %[ + evaluate-commands -draft -itersel %[ # align to opening curly brace when alone on a line - try %[ exec -draft ^\h+\}$ m s \A|.\z 1 ] + try %[ execute-keys -draft ^\h+\}$ m s \A|.\z 1 ] ] ] diff --git a/rc/base/spell.kak b/rc/base/spell.kak index 7a870b79..a1811a9b 100644 --- a/rc/base/spell.kak +++ b/rc/base/spell.kak @@ -109,7 +109,7 @@ define-command spell-replace %{ %sh{ menu=$(printf %s "${suggestions#?}" | awk -F', ' ' { for (i=1; i<=NF; i++) - printf "%s", "%{"$i"}" "%{exec -itersel c"$i"be}" + printf "%s", "%{"$i"}" "%{execute-keys -itersel c"$i"be}" } ') printf 'try %%{ menu -auto-single %s }' "${menu}" diff --git a/rc/base/tmux.kak b/rc/base/tmux.kak index b7dbc217..068492b4 100644 --- a/rc/base/tmux.kak +++ b/rc/base/tmux.kak @@ -45,7 +45,7 @@ If no client is passed then the current one is used} \ -params ..1 -client-completion \ tmux-focus %{ %sh{ if [ $# -eq 1 ]; then - printf %s\\n "eval -client '$1' focus" + printf %s\\n "evaluate-commands -client '$1' focus" elif [ -n "${kak_client_env_TMUX}" ]; then TMUX="${kak_client_env_TMUX}" tmux select-pane -t "${kak_client_env_TMUX_PANE}" > /dev/null fi diff --git a/rc/base/x11.kak b/rc/base/x11.kak index 3094b702..97cff767 100644 --- a/rc/base/x11.kak +++ b/rc/base/x11.kak @@ -39,7 +39,7 @@ If no client is passed, then the current client is used} \ -params ..1 -client-completion \ x11-focus %{ %sh{ if [ $# -eq 1 ]; then - printf %s\\n "eval -client '$1' focus" + printf %s\\n "evaluate-commands -client '$1' focus" else xdotool windowactivate $kak_client_env_WINDOWID > /dev/null fi diff --git a/rc/base/yaml.kak b/rc/base/yaml.kak index da62abbc..82c683bb 100644 --- a/rc/base/yaml.kak +++ b/rc/base/yaml.kak @@ -30,19 +30,19 @@ add-highlighter shared/yaml/code regex ^\h*-?\h*(\S+): 1:attribute define-command -hidden yaml-filter-around-selections %{ # remove trailing white spaces - try %{ exec -draft -itersel s \h+$ d } + try %{ execute-keys -draft -itersel s \h+$ d } } define-command -hidden yaml-indent-on-new-line %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # copy '#' comment prefix and following white spaces - try %{ exec -draft k s ^\h*\K#\h* y gh j P } + try %{ execute-keys -draft k s ^\h*\K#\h* y gh j P } # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # filter previous line - try %{ exec -draft k : yaml-filter-around-selections } + try %{ execute-keys -draft k : yaml-filter-around-selections } # indent after : - try %{ exec -draft k x :$ j } + try %{ execute-keys -draft k x :$ j } } } diff --git a/rc/core/c-family.kak b/rc/core/c-family.kak index f2cdf461..e9234400 100644 --- a/rc/core/c-family.kak +++ b/rc/core/c-family.kak @@ -12,7 +12,7 @@ hook global BufCreate .*\.c$ %{ hook global BufCreate .*\.h$ %{ try %{ - exec -draft %{%s\b::\b|\btemplate\h*|\bclass\h+\w+|\b(typename|namespace)\b|\b(public|private|protected)\h*:} + execute-keys -draft %{%s\b::\b|\btemplate\h*|\bclass\h+\w+|\b(typename|namespace)\b|\b(public|private|protected)\h*:} set-option buffer filetype cpp } catch %{ set-option buffer filetype c @@ -23,103 +23,103 @@ hook global BufCreate .*\.m %{ set-option buffer filetype objc } -define-command -hidden c-family-trim-autoindent %[ eval -draft -itersel %[ +define-command -hidden c-family-trim-autoindent %[ evaluate-commands -draft -itersel %[ # remove the line if it's empty when leaving the insert mode - try %[ exec 1s^(\h+)$ d ] + try %[ execute-keys 1s^(\h+)$ d ] ] ] -define-command -hidden c-family-indent-on-newline %< eval -draft -itersel %< - exec \; +define-command -hidden c-family-indent-on-newline %< evaluate-commands -draft -itersel %< + execute-keys \; try %< # if previous line closed a paren, copy indent of the opening paren line - exec -draft k 1s(\))(\h+\w+)*\h*(\;\h*)?$ mJ s\A|.\z 1 + execute-keys -draft k 1s(\))(\h+\w+)*\h*(\;\h*)?$ mJ s\A|.\z 1 > catch %< # else indent new lines with the same level as the previous one - exec -draft K + execute-keys -draft K > # remove previous empty lines resulting from the automatic indent - try %< exec -draft k ^\h+$ Hd > + try %< execute-keys -draft k ^\h+$ Hd > # indent after an opening brace - try %< exec -draft k s\{\h*$ j > + try %< execute-keys -draft k s\{\h*$ j > # indent after a label - try %< exec -draft k s[a-zA-Z0-9_-]+:\h*$ j > + try %< execute-keys -draft k s[a-zA-Z0-9_-]+:\h*$ j > # indent after a statement not followed by an opening brace - try %< exec -draft k \b(if|else|for|while)\h*\(.+?\)\h*$ j > + try %< execute-keys -draft k \b(if|else|for|while)\h*\(.+?\)\h*$ j > # align to the opening parenthesis or opening brace (whichever is first) # on a previous line if its followed by text on the same line - try %< eval -draft %< + try %< evaluate-commands -draft %< # Go to opening parenthesis and opening brace, then select the most nested one - try %< try %< exec [bZ[B > catch %< exec [B > > + try %< try %< execute-keys [bZ[B > catch %< execute-keys [B > > # Validate selection and get first and last char - exec \A[{(](\h*\S+)+\n L s\A|.\z + execute-keys \A[{(](\h*\S+)+\n L s\A|.\z # Remove eventual indent from new line - try %< exec -draft s\h+ d > + try %< execute-keys -draft s\h+ d > # Now align that new line with the opening parenthesis/brace - exec & + execute-keys & > > > > define-command -hidden c-family-indent-on-opening-curly-brace %[ # align indent with opening paren when { is entered on a new line after the closing paren - try %[ exec -draft -itersel h)M \A\(.*\)\h*\n\h*\{\z s \A|.\z 1 ] + try %[ execute-keys -draft -itersel h)M \A\(.*\)\h*\n\h*\{\z s \A|.\z 1 ] ] define-command -hidden c-family-indent-on-closing-curly-brace %[ # align to opening curly brace when alone on a line - try %[ exec -itersel -draft ^\h+\}$hms\A|.\z1 ] + try %[ execute-keys -itersel -draft ^\h+\}$hms\A|.\z1 ] ] define-command -hidden c-family-insert-on-closing-curly-brace %[ # add a semicolon after a closing brace if part of a class, union or struct definition - try %[ exec -itersel -draft hmB\A\h*(class|struct|union|enum) a\; ] + try %[ execute-keys -itersel -draft hmB\A\h*(class|struct|union|enum) a\; ] ] -define-command -hidden c-family-insert-on-newline %[ eval -draft %[ - exec \; +define-command -hidden c-family-insert-on-newline %[ evaluate-commands -draft %[ + execute-keys \; try %[ - eval -draft %[ + evaluate-commands -draft %[ # copy the commenting prefix - exec -save-regs '' k 1s^\h*(//+\h*) y + execute-keys -save-regs '' k 1s^\h*(//+\h*) y try %[ # if the previous comment isn't empty, create a new one - exec ^\h*//+\h*$ js^\h*P + execute-keys ^\h*//+\h*$ js^\h*P ] catch %[ # if there is no text in the previous comment, remove it completely - exec d + execute-keys d ] ] ] try %[ # if the previous line isn't within a comment scope, break - exec -draft k ^(\h*/\*|\h+\*(?!/)) + execute-keys -draft k ^(\h*/\*|\h+\*(?!/)) # find comment opening, validate it was not closed, and check its using star prefixes - exec -draft /\* \*/ \A\h*/\*([^\n]*\n\h*\*)*[^\n]*\n\h*.\z + execute-keys -draft /\* \*/ \A\h*/\*([^\n]*\n\h*\*)*[^\n]*\n\h*.\z try %[ # if the previous line is opening the comment, insert star preceeded by space - exec -draft k^\h*/\* - exec -draft i* + execute-keys -draft k^\h*/\* + execute-keys -draft i* ] catch %[ try %[ # if the next line is a comment line insert a star - exec -draft j^\h+\* - exec -draft i* + execute-keys -draft j^\h+\* + execute-keys -draft i* ] catch %[ try %[ # if the previous line is an empty comment line, close the comment scope - exec -draft k^\h+\*\h+$ 1s\*(\h*)c/ + execute-keys -draft k^\h+\*\h+$ 1s\*(\h*)c/ ] catch %[ # if the previous line is a non-empty comment line, add a star - exec -draft i* + execute-keys -draft i* ] ] ] # trim trailing whitespace on the previous line - try %[ exec -draft 1s(\h+)$d ] + try %[ execute-keys -draft 1s(\h+)$d ] # align the new star with the previous one - exec J1s^[^*]*(\*)& + execute-keys J1s^[^*]*(\*)& ] ] ] @@ -288,10 +288,10 @@ define-command -hidden c-family-insert-include-guards %{ %sh{ case "${kak_opt_c_include_guard_style}" in ifdef) - echo 'exec ggi%ggxs\.c_A_INCLUDEDggxyppI#ifndefjI#definejI#endif//O' + echo 'execute-keys ggi%ggxs\.c_A_INCLUDEDggxyppI#ifndefjI#definejI#endif//O' ;; pragma) - echo 'exec ggi#pragmaonce' + echo 'execute-keys ggi#pragmaonce' ;; *);; esac diff --git a/rc/core/comment.kak b/rc/core/comment.kak index 8fd4a90a..acb96f89 100644 --- a/rc/core/comment.kak +++ b/rc/core/comment.kak @@ -96,7 +96,7 @@ hook global BufSetOption filetype=ruby %{ define-command comment-block -docstring '(un)comment selected lines using block comments' %{ %sh{ exec_proof() { - ## Replace the '<' sign that is interpreted differently in `exec` + ## Replace the '<' sign that is interpreted differently in `execute-keys` printf %s\\n "$@" | sed 's,<,,g' } @@ -108,19 +108,19 @@ define-command comment-block -docstring '(un)comment selected lines using block exit fi - printf %s\\n "eval -draft %{ try %{ + printf %s\\n "evaluate-commands -draft %{ try %{ ## The selection is empty - exec \\A[\\h\\v\\n]*\\z + execute-keys \\A[\\h\\v\\n]*\\z try %{ ## The selection has already been commented - exec %{\\A\\Q${opening}\\E.*\\Q${closing}\\E\\n*\\z} + execute-keys %{\\A\\Q${opening}\\E.*\\Q${closing}\\E\\n*\\z} ## Comment the selection - exec -draft %{a${closing}i${opening}} + execute-keys -draft %{a${closing}i${opening}} } catch %{ ## Uncomment the commented selection - exec -draft %{s(\\A\\Q${opening}\\E)|(\\Q${closing}\\E\\n*\\z)d} + execute-keys -draft %{s(\\A\\Q${opening}\\E)|(\\Q${closing}\\E\\n*\\z)d} } } }" } @@ -136,23 +136,23 @@ define-command comment-line -docstring '(un)comment selected lines using line co exit fi - printf %s\\n "eval -draft %{ + printf %s\\n "evaluate-commands -draft %{ ## Select the content of the lines, without indentation - exec I + execute-keys I try %{ ## There’s no text on the line - exec \\A[\\h\\v\\n]*\\z + execute-keys \\A[\\h\\v\\n]*\\z try %{ ## The line has already been commented - exec %{\\A${opening_escaped}} + execute-keys %{\\A${opening_escaped}} ## Comment the line - exec -draft %{i${opening}} + execute-keys -draft %{i${opening}} } catch %{ ## Uncomment the line - exec -draft %{s\\A${opening_escaped}\\h*d} + execute-keys -draft %{s\\A${opening_escaped}\\h*d} } } }" diff --git a/rc/core/doc.kak b/rc/core/doc.kak index 370a9e2e..f84192ac 100644 --- a/rc/core/doc.kak +++ b/rc/core/doc.kak @@ -4,10 +4,10 @@ declare-option -docstring "name of the client in which documentation is to be di declare-option -hidden range-specs doc_render_ranges define-command -hidden -params 4 doc-render-regex %{ - eval -draft %{ try %{ - exec \%s %arg{1} - exec -draft s %arg{2} d - exec "%arg{3}" + evaluate-commands -draft %{ try %{ + execute-keys \%s %arg{1} + execute-keys -draft s %arg{2} d + execute-keys "%arg{3}" %sh{ ranges=$(echo "$kak_selections_desc" | sed -e "s/:/|$4:/g; s/\$/|$4/") echo "update-option buffer doc_render_ranges" @@ -18,13 +18,13 @@ define-command -hidden -params 4 doc-render-regex %{ define-command -params 1 -hidden doc-render %{ edit! -scratch *doc* - exec "!cat %arg{1}gg" + execute-keys "!cat %arg{1}gg" # Join paragraphs together - try %{ exec -draft \%S \n{2,}|(?<=\+)\n|^[^\n]+::\n ^-{2,}(\n|\z) S\n\z \n } + try %{ execute-keys -draft \%S \n{2,}|(?<=\+)\n|^[^\n]+::\n ^-{2,}(\n|\z) S\n\z \n } # Remove some line end markers - try %{ exec -draft \%s \h*(\+|:{2,})$ d } + try %{ execute-keys -draft \%s \h*(\+|:{2,})$ d } # Setup the doc_render_ranges option set-option buffer doc_render_ranges %val{timestamp} @@ -37,7 +37,7 @@ define-command -params 1 -hidden doc-render %{ doc-render-regex .*? .*,| 'H' link # Remove escaping of * and ` - try %{ exec -draft \%s \\((?=\*)|(?=`)) d } + try %{ execute-keys -draft \%s \\((?=\*)|(?=`)) d } set-option buffer readonly true add-highlighter buffer ranges doc_render_ranges @@ -57,7 +57,7 @@ An optional keyword argument can be passed to the function, which will be automa shift if [ -f "${page}" ]; then - printf %s\\n "eval -try-client %opt{docsclient} doc-render ${page}" + printf %s\\n "evaluate-commands -try-client %opt{docsclient} doc-render ${page}" else printf %s\\n "echo -markup '{Error}No such doc file: ${page}'" fi diff --git a/rc/core/formatter.kak b/rc/core/formatter.kak index 36ec8b99..2439bd4a 100644 --- a/rc/core/formatter.kak +++ b/rc/core/formatter.kak @@ -1,7 +1,7 @@ declare-option -docstring "shell command to which the contents of the current buffer is piped" \ str formatcmd -define-command format -docstring "Format the contents of the current buffer" %{ eval -draft %{ +define-command format -docstring "Format the contents of the current buffer" %{ evaluate-commands -draft %{ %sh{ if [ -n "${kak_opt_formatcmd}" ]; then path_file_tmp=$(mktemp "${TMPDIR:-/tmp}"/kak-formatter-XXXXXX) @@ -12,11 +12,11 @@ define-command format -docstring "Format the contents of the current buffer" %{ readonly path_file_out=\$(mktemp \"${TMPDIR:-/tmp}\"/kak-formatter-XXXXXX) if cat \"${path_file_tmp}\" | eval \"${kak_opt_formatcmd}\" > \"\${path_file_out}\"; then - printf '%s\\n' \"exec \\%|cat'\${path_file_out}'\" + printf '%s\\n' \"execute-keys \\%|cat'\${path_file_out}'\" printf '%s\\n' \"%sh{ rm -f '\${path_file_out}' }\" else printf '%s\\n' \" - eval -client '${kak_client}' echo -markup '{Error}formatter returned an error (\$?)' + evaluate-commands -client '${kak_client}' echo -markup '{Error}formatter returned an error (\$?)' \" rm -f \"\${path_file_out}\" fi @@ -25,7 +25,7 @@ define-command format -docstring "Format the contents of the current buffer" %{ } " else - printf '%s\n' "eval -client '${kak_client}' echo -markup '{Error}formatcmd option not specified'" + printf '%s\n' "evaluate-commands -client '${kak_client}' echo -markup '{Error}formatcmd option not specified'" fi } } } diff --git a/rc/core/grep.kak b/rc/core/grep.kak index 31892ebd..4048c93c 100644 --- a/rc/core/grep.kak +++ b/rc/core/grep.kak @@ -16,7 +16,7 @@ All the optional arguments are forwarded to the grep utility} \ ( ${kak_opt_grepcmd} "${kak_selection}" | tr -d '\r' > ${output} 2>&1 ) > /dev/null 2>&1 < /dev/null & fi - printf %s\\n "eval -try-client '$kak_opt_toolsclient' %{ + printf %s\\n "evaluate-commands -try-client '$kak_opt_toolsclient' %{ edit! -fifo ${output} -scroll *grep* set-option buffer filetype grep set-option buffer grep_current_line 0 @@ -47,34 +47,34 @@ declare-option -docstring "name of the client in which all source code jumps wil str jumpclient define-command -hidden grep-jump %{ - eval -collapse-jumps %{ + evaluate-commands -collapse-jumps %{ try %{ - exec 's^((?:\w:)?[^:]+):(\d+):(\d+)?' + execute-keys 's^((?:\w:)?[^:]+):(\d+):(\d+)?' set-option buffer grep_current_line %val{cursor_line} - eval -try-client %opt{jumpclient} edit -existing %reg{1} %reg{2} %reg{3} + evaluate-commands -try-client %opt{jumpclient} edit -existing %reg{1} %reg{2} %reg{3} try %{ focus %opt{jumpclient} } } } } define-command grep-next-match -docstring 'Jump to the next grep match' %{ - eval -collapse-jumps -try-client %opt{jumpclient} %{ + evaluate-commands -collapse-jumps -try-client %opt{jumpclient} %{ buffer '*grep*' # First jump to enf of buffer so that if grep_current_line == 0 # 0g will be a no-op and we'll jump to the first result. # Yeah, thats ugly... - exec "ge %opt{grep_current_line}g /^[^:]+:\d+:" + execute-keys "ge %opt{grep_current_line}g /^[^:]+:\d+:" grep-jump } - try %{ eval -client %opt{toolsclient} %{ exec gg %opt{grep_current_line}g } } + try %{ evaluate-commands -client %opt{toolsclient} %{ execute-keys gg %opt{grep_current_line}g } } } define-command grep-previous-match -docstring 'Jump to the previous grep match' %{ - eval -collapse-jumps -try-client %opt{jumpclient} %{ + evaluate-commands -collapse-jumps -try-client %opt{jumpclient} %{ buffer '*grep*' # See comment in grep-next-match - exec "ge %opt{grep_current_line}g ^[^:]+:\d+:" + execute-keys "ge %opt{grep_current_line}g ^[^:]+:\d+:" grep-jump } - try %{ eval -client %opt{toolsclient} %{ exec gg %opt{grep_current_line}g } } + try %{ evaluate-commands -client %opt{toolsclient} %{ execute-keys gg %opt{grep_current_line}g } } } diff --git a/rc/core/kakrc.kak b/rc/core/kakrc.kak index 9479aa22..95d07ef1 100644 --- a/rc/core/kakrc.kak +++ b/rc/core/kakrc.kak @@ -29,8 +29,9 @@ add-highlighter shared/ regions -default code kakrc \ keywords="edit write write-all kill quit write-quit write-all-quit map unmap alias unalias buffer buffer-next buffer-previous delete-buffer add-highlighter remove-highlighter hook remove-hooks define-command echo debug source try fail - set-option unset-option update-option declare-option exec eval prompt menu on-key info - set-face rename-client set-register select change-directory rename-session colorscheme" + set-option unset-option update-option declare-option execute-keys evaluate-commands + prompt menu on-key info set-face rename-client set-register select change-directory + rename-session colorscheme" attributes="global buffer window current normal insert menu prompt goto view user object number_lines show_matching show_whitespaces fill regex dynregex group flag_lines @@ -64,15 +65,15 @@ add-highlighter shared/kakrc/shell ref sh # ‾‾‾‾‾‾‾‾ define-command -hidden kak-indent-on-new-line %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # copy '#' comment prefix and following white spaces - try %{ exec -draft k s ^\h*#\h* y jgh P } + try %{ execute-keys -draft k s ^\h*#\h* y jgh P } # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # cleanup trailing whitespaces from previous line - try %{ exec -draft k s \h+$ d } + try %{ execute-keys -draft k s \h+$ d } # indent after line ending with %[\W\S] - try %{ exec -draft k \%[\W\S]$ j } + try %{ execute-keys -draft k \%[\W\S]$ j } } } @@ -84,7 +85,7 @@ hook -group kak-highlight global WinSetOption filetype=kak %{ add-highlighter wi hook global WinSetOption filetype=kak %{ hook window InsertChar \n -group kak-indent kak-indent-on-new-line # cleanup trailing whitespaces on current line insert end - hook window InsertEnd .* -group kak-indent %{ try %{ exec -draft \; s ^\h+$ d } } + hook window InsertEnd .* -group kak-indent %{ try %{ execute-keys -draft \; s ^\h+$ d } } set-option buffer extra_word_chars '-' } diff --git a/rc/core/make.kak b/rc/core/make.kak index b3056aa2..34a1db0d 100644 --- a/rc/core/make.kak +++ b/rc/core/make.kak @@ -15,7 +15,7 @@ All the optional arguments are forwarded to the make utility} \ mkfifo ${output} ( eval ${kak_opt_makecmd} "$@" > ${output} 2>&1 ) > /dev/null 2>&1 < /dev/null & - printf %s\\n "eval -try-client '$kak_opt_toolsclient' %{ + printf %s\\n "evaluate-commands -try-client '$kak_opt_toolsclient' %{ edit! -fifo ${output} -scroll *make* set-option buffer filetype make set-option buffer make_current_error_line 0 @@ -47,35 +47,35 @@ declare-option -docstring "name of the client in which all source code jumps wil str jumpclient define-command -hidden make-jump %{ - eval -collapse-jumps %{ + evaluate-commands -collapse-jumps %{ try %{ - exec gl "Entering directory" + execute-keys gl "Entering directory" # Try to parse the error into capture groups, failing on absolute paths - exec s "Entering directory '([^']+)'.*\n([^:/][^:]*):(\d+):(?:(\d+):)?([^\n]+)\z" l + execute-keys s "Entering directory '([^']+)'.*\n([^:/][^:]*):(\d+):(?:(\d+):)?([^\n]+)\z" l set-option buffer make_current_error_line %val{cursor_line} - eval -try-client %opt{jumpclient} "edit -existing %reg{1}/%reg{2} %reg{3} %reg{4}; echo -markup %{{Information}%reg{5}}; try %{ focus }" + evaluate-commands -try-client %opt{jumpclient} "edit -existing %reg{1}/%reg{2} %reg{3} %reg{4}; echo -markup %{{Information}%reg{5}}; try %{ focus }" } catch %{ - exec s "((?:\w:)?[^:]+):(\d+):(?:(\d+):)?([^\n]+)\z" l + execute-keys s "((?:\w:)?[^:]+):(\d+):(?:(\d+):)?([^\n]+)\z" l set-option buffer make_current_error_line %val{cursor_line} - eval -try-client %opt{jumpclient} "edit -existing %reg{1} %reg{2} %reg{3}; echo -markup %{{Information}%reg{4}}; try %{ focus }" + evaluate-commands -try-client %opt{jumpclient} "edit -existing %reg{1} %reg{2} %reg{3}; echo -markup %{{Information}%reg{4}}; try %{ focus }" } } } define-command make-next-error -docstring 'Jump to the next make error' %{ - eval -collapse-jumps -try-client %opt{jumpclient} %{ + evaluate-commands -collapse-jumps -try-client %opt{jumpclient} %{ buffer '*make*' - exec "%opt{make_current_error_line}ggl" "/^(?:\w:)?[^:\n]+:\d+:(?:\d+:)?%opt{make_error_pattern}" + execute-keys "%opt{make_current_error_line}ggl" "/^(?:\w:)?[^:\n]+:\d+:(?:\d+:)?%opt{make_error_pattern}" make-jump } - try %{ eval -client %opt{toolsclient} %{ exec %opt{make_current_error_line}g } } + try %{ evaluate-commands -client %opt{toolsclient} %{ execute-keys %opt{make_current_error_line}g } } } define-command make-previous-error -docstring 'Jump to the previous make error' %{ - eval -collapse-jumps -try-client %opt{jumpclient} %{ + evaluate-commands -collapse-jumps -try-client %opt{jumpclient} %{ buffer '*make*' - exec "%opt{make_current_error_line}g" "^(?:\w:)?[^:\n]+:\d+:(?:\d+:)?%opt{make_error_pattern}" + execute-keys "%opt{make_current_error_line}g" "^(?:\w:)?[^:\n]+:\d+:(?:\d+:)?%opt{make_error_pattern}" make-jump } - try %{ eval -client %opt{toolsclient} %{ exec %opt{make_current_error_line}g } } + try %{ evaluate-commands -client %opt{toolsclient} %{ execute-keys %opt{make_current_error_line}g } } } diff --git a/rc/core/makefile.kak b/rc/core/makefile.kak index 0567087f..ab4dd2f7 100644 --- a/rc/core/makefile.kak +++ b/rc/core/makefile.kak @@ -10,10 +10,10 @@ hook global BufCreate .*/?[mM]akefile %{ add-highlighter shared/ regions -default content makefile \ comment '#' '$' '' \ - eval '\$\(' '\)' '\(' + evaluate-commands '\$\(' '\)' '\(' add-highlighter shared/makefile/comment fill comment -add-highlighter shared/makefile/eval fill value +add-highlighter shared/makefile/evaluate-commands fill value add-highlighter shared/makefile/content regex ^[\w.%-]+\h*:\s 0:variable add-highlighter shared/makefile/content regex [+?:]= 0:operator @@ -35,15 +35,15 @@ add-highlighter shared/makefile/content regex [+?:]= 0:operator # ‾‾‾‾‾‾‾‾ define-command -hidden makefile-indent-on-new-line %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # preserve previous line indent - try %{ exec -draft \;K } + try %{ execute-keys -draft \;K } ## If the line above is a target indent with a tab - try %{ exec -draft Z k ^[^:]+:\s z i } + try %{ execute-keys -draft Z k ^[^:]+:\s z i } # cleanup trailing white space son previous line - try %{ exec -draft k s \h+$ d } + try %{ execute-keys -draft k s \h+$ d } # indent after some keywords - try %{ exec -draft Z k ^\h*(ifeq|ifneq|ifdef|ifndef|else|define)\b z } + try %{ execute-keys -draft Z k ^\h*(ifeq|ifneq|ifdef|ifndef|else|define)\b z } } } diff --git a/rc/core/man.kak b/rc/core/man.kak index 8d997ac4..77dd57fc 100644 --- a/rc/core/man.kak +++ b/rc/core/man.kak @@ -37,7 +37,7 @@ define-command -hidden -params 1..2 man-impl %{ %sh{ if [ "${retval}" -eq 0 ]; then printf %s\\n " edit -scratch '*man*' - exec '%|cat${colout}gk' + execute-keys '%|cat${colout}gk' nop %sh{rm ${colout}} set-option buffer filetype man set-option window manpage '$@' @@ -75,5 +75,5 @@ The page can be a word, or a word directly followed by a section number between ;; esac - printf %s\\n "eval -collapse-jumps -try-client %opt{docsclient} man-impl $pagenum $subject" + printf %s\\n "evaluate-commands -collapse-jumps -try-client %opt{docsclient} man-impl $pagenum $subject" } } diff --git a/rc/core/python.kak b/rc/core/python.kak index 306cbeba..8d145156 100644 --- a/rc/core/python.kak +++ b/rc/core/python.kak @@ -64,15 +64,15 @@ add-highlighter shared/python/comment fill comment # ‾‾‾‾‾‾‾‾ define-command -hidden python-indent-on-new-line %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # copy '#' comment prefix and following white spaces - try %{ exec -draft k s ^\h*#\h* y jgh P } + try %{ execute-keys -draft k s ^\h*#\h* y jgh P } # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # cleanup trailing whitespaces from previous line - try %{ exec -draft k s \h+$ d } + try %{ execute-keys -draft k s \h+$ d } # indent after line ending with : - try %{ exec -draft k x :$ j } + try %{ execute-keys -draft k x :$ j } } } @@ -84,7 +84,7 @@ hook -group python-highlight global WinSetOption filetype=python %{ add-highligh hook global WinSetOption filetype=python %{ hook window InsertChar \n -group python-indent python-indent-on-new-line # cleanup trailing whitespaces on current line insert end - hook window InsertEnd .* -group python-indent %{ try %{ exec -draft \; s ^\h+$ d } } + hook window InsertEnd .* -group python-indent %{ try %{ execute-keys -draft \; s ^\h+$ d } } } hook -group python-highlight global WinSetOption filetype=(?!python).* %{ remove-highlighter window/python } diff --git a/rc/extra/autorestore.kak b/rc/extra/autorestore.kak index 6ded8991..e2709c50 100644 --- a/rc/extra/autorestore.kak +++ b/rc/extra/autorestore.kak @@ -29,7 +29,7 @@ define-command autorestore-restore-buffer -docstring "Restore the backup for the ## Replace the content of the buffer with the content of the backup file echo -debug Restoring file: ${newer} - exec -draft %{ %d!cat\"${newer}\"d } + execute-keys -draft %{ %d!cat\"${newer}\"d } ## If the backup file has to be removed, issue the command once ## the current buffer has been saved diff --git a/rc/extra/cabal.kak b/rc/extra/cabal.kak index c22f5b1a..7500270c 100644 --- a/rc/extra/cabal.kak +++ b/rc/extra/cabal.kak @@ -26,33 +26,33 @@ add-highlighter shared/cabal/code regex ^\h*([A-Za-z][A-Za-z0-9_-]*)\h*: 1:varia define-command -hidden cabal-filter-around-selections %{ # remove trailing white spaces - try %{ exec -draft -itersel s \h+$ d } + try %{ execute-keys -draft -itersel s \h+$ d } } define-command -hidden cabal-indent-on-new-line %[ - eval -draft -itersel %[ + evaluate-commands -draft -itersel %[ # copy '#' comment prefix and following white spaces - try %[ exec -draft k s ^\h*\K#\h* y gh j P ] + try %[ execute-keys -draft k s ^\h*\K#\h* y gh j P ] # preserve previous line indent - try %[ exec -draft \; K ] + try %[ execute-keys -draft \; K ] # filter previous line - try %[ exec -draft k : cabal-filter-around-selections ] + try %[ execute-keys -draft k : cabal-filter-around-selections ] # indent after lines ending with { or : - try %[ exec -draft k [:{]$ j ] + try %[ execute-keys -draft k [:{]$ j ] ] ] define-command -hidden cabal-indent-on-opening-curly-brace %[ - eval -draft -itersel %[ + evaluate-commands -draft -itersel %[ # align indent with opening paren when { is entered on a new line after the closing paren - try %[ exec -draft h ) M \A\(.*\)\h*\n\h*\{\z s \A|.\z 1 ] + try %[ execute-keys -draft h ) M \A\(.*\)\h*\n\h*\{\z s \A|.\z 1 ] ] ] define-command -hidden cabal-indent-on-closing-curly-brace %[ - eval -draft -itersel %[ + evaluate-commands -draft -itersel %[ # align to opening curly brace when alone on a line - try %[ exec -draft ^\h+\}$ h m s \A|.\z 1 ] + try %[ execute-keys -draft ^\h+\}$ h m s \A|.\z 1 ] ] ] diff --git a/rc/extra/clang.kak b/rc/extra/clang.kak index 9d9e3e90..6d6dd0a0 100644 --- a/rc/extra/clang.kak +++ b/rc/extra/clang.kak @@ -14,13 +14,13 @@ The syntaxic errors detected during parsing are shown when auto-diagnostics are dir=$(mktemp -d "${TMPDIR:-/tmp}"/kak-clang.XXXXXXXX) mkfifo ${dir}/fifo printf %s\\n "set-option buffer clang_tmp_dir ${dir}" - printf %s\\n "eval -no-hooks write ${dir}/buf" + printf %s\\n "evaluate-commands -no-hooks write ${dir}/buf" } # end the previous %sh{} so that its output gets interpreted by kakoune # before launching the following as a background task. %sh{ dir=${kak_opt_clang_tmp_dir} - printf %s\\n "eval -draft %{ + printf %s\\n "evaluate-commands -draft %{ edit! -fifo ${dir}/fifo -debug *clang-output* set-option buffer filetype make set-option buffer make_current_error_line 0 @@ -75,11 +75,11 @@ The syntaxic errors detected during parsing are shown when auto-diagnostics are print id "|" docstrings[id] "|" menu } }' | paste -s -d ':' - | sed -e "s/\\\\n/\\n/g; s/'/\\\\'/g") - printf %s\\n "eval -client ${kak_client} echo 'clang completion done' + printf %s\\n "evaluate-commands -client ${kak_client} echo 'clang completion done' set-option 'buffer=${kak_buffile}' clang_completions '${header}:${compl}'" | kak -p ${kak_session} else clang++ -x ${ft} -fsyntax-only ${kak_opt_clang_options} - < ${dir}/buf 2> ${dir}/stderr - printf %s\\n "eval -client ${kak_client} echo 'clang parsing done'" | kak -p ${kak_session} + printf %s\\n "evaluate-commands -client ${kak_client} echo 'clang parsing done'" | kak -p ${kak_session} fi flags=$(cat ${dir}/stderr | sed -rne " @@ -104,12 +104,12 @@ The syntaxic errors detected during parsing are shown when auto-diagnostics are define-command clang-complete -docstring "Complete the current selection" %{ clang-parse -complete } define-command -hidden clang-show-completion-info %[ try %[ - eval -draft %[ - exec {( ^\( b \A\w+\z + evaluate-commands -draft %[ + execute-keys {( ^\( b \A\w+\z %sh[ desc=$(printf %s\\n "${kak_opt_clang_completions}" | sed -e "{ s/\([^\\]\):/\1\n/g }" | sed -ne "/^${kak_selection}|/ { s/^[^|]\+|//; s/|.*$//; s/\\\:/:/g; p }") if [ -n "$desc" ]; then - printf %s\\n "eval -client $kak_client %{info -anchor ${kak_cursor_line}.${kak_cursor_column} -placement above %{${desc}}}" + printf %s\\n "evaluate-commands -client $kak_client %{info -anchor ${kak_cursor_line}.${kak_cursor_column} -placement above %{${desc}}}" fi ] ] ] ] @@ -118,7 +118,7 @@ define-command clang-enable-autocomplete -docstring "Enable automatic clang comp set-option window completers "option=clang_completions:%opt{completers}" hook window -group clang-autocomplete InsertIdle .* %{ try %{ - exec -draft (\.|->|::).\z + execute-keys -draft (\.|->|::).\z echo 'completing...' clang-complete } @@ -170,7 +170,7 @@ define-command clang-diagnostics-next -docstring "Jump to the next line that con done line=${line-$first_line} if [ -n "$line" ]; then - printf %s\\n "exec ${line} g" + printf %s\\n "execute-keys ${line} g" else echo "echo -markup '{Error}no next clang diagnostic'" fi diff --git a/rc/extra/coffee.kak b/rc/extra/coffee.kak index 37b2c443..91ddfdec 100644 --- a/rc/extra/coffee.kak +++ b/rc/extra/coffee.kak @@ -46,23 +46,23 @@ add-highlighter shared/coffee/code regex \b(break|case|catch|class|const|continu # ‾‾‾‾‾‾‾‾ define-command -hidden coffee-filter-around-selections %{ - eval -draft -itersel %{ - exec + evaluate-commands -draft -itersel %{ + execute-keys # remove trailing white spaces - try %{ exec -draft s \h + $ d } + try %{ execute-keys -draft s \h + $ d } } } define-command -hidden coffee-indent-on-new-line %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # copy '#' comment prefix and following white spaces - try %{ exec -draft k s '^\h*\K#\h*' y gh j P } + try %{ execute-keys -draft k s '^\h*\K#\h*' y gh j P } # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # filter previous line - try %{ exec -draft k : coffee-filter-around-selections } + try %{ execute-keys -draft k : coffee-filter-around-selections } # indent after start structure - try %{ exec -draft k ^ \h * (case|catch|class|else|finally|for|function|if|switch|try|while|with) \b | (=|->) $ j } + try %{ execute-keys -draft k ^ \h * (case|catch|class|else|finally|for|function|if|switch|try|while|with) \b | (=|->) $ j } } } diff --git a/rc/extra/cucumber.kak b/rc/extra/cucumber.kak index 504c3f3b..06a100aa 100644 --- a/rc/extra/cucumber.kak +++ b/rc/extra/cucumber.kak @@ -58,19 +58,19 @@ add-highlighter shared/cucumber/code regex \b(Feature|Business\h+Need|Ability|Ba define-command -hidden cucumber-filter-around-selections %{ # remove trailing white spaces - try %{ exec -draft -itersel s \h+$ d } + try %{ execute-keys -draft -itersel s \h+$ d } } define-command -hidden cucumber-indent-on-new-line %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # copy '#' comment prefix and following white spaces - try %{ exec -draft k s ^\h*\K#\h* y gh j P } + try %{ execute-keys -draft k s ^\h*\K#\h* y gh j P } # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # filter previous line - try %{ exec -draft k : cucumber-filter-around-selections } + try %{ execute-keys -draft k : cucumber-filter-around-selections } # indent after lines containing : - try %{ exec -draft k x : j } + try %{ execute-keys -draft k x : j } } } diff --git a/rc/extra/editorconfig.kak b/rc/extra/editorconfig.kak index e827613f..767360bb 100644 --- a/rc/extra/editorconfig.kak +++ b/rc/extra/editorconfig.kak @@ -41,7 +41,7 @@ define-command editorconfig-load -params ..1 -docstring "editorconfig-load [file } hook buffer BufWritePre %val{buffile} -group editorconfig-hooks %{ %sh{ if [ ${kak_opt_editorconfig_trim_trailing_whitespace} = "true" ]; then - printf %s\\n "try %{ exec -draft %{ %s\h+$d } }" + printf %s\\n "try %{ execute-keys -draft %{ %s\h+$d } }" fi } } } diff --git a/rc/extra/elixir.kak b/rc/extra/elixir.kak index 3b30053f..30927773 100644 --- a/rc/extra/elixir.kak +++ b/rc/extra/elixir.kak @@ -44,21 +44,21 @@ add-highlighter shared/elixir/code regex '\b\d+[\d_]*\b' 0:value define-command -hidden elixir-filter-around-selections %{ # remove trailing white spaces - try %{ exec -draft -itersel s \h+$ d } + try %{ execute-keys -draft -itersel s \h+$ d } } define-command -hidden elixir-indent-on-new-line %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # copy -- comments prefix and following white spaces - try %{ exec -draft k s ^\h*\K--\h* y gh j P } + try %{ execute-keys -draft k s ^\h*\K--\h* y gh j P } # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # indent after line ending with: - # try %{ exec -draft k x (do|else|->)$ & } + # try %{ execute-keys -draft k x (do|else|->)$ & } # filter previous line - try %{ exec -draft k : elixir-filter-around-selections } + try %{ execute-keys -draft k : elixir-filter-around-selections } # indent after lines ending with do or -> - try %{ exec -draft \\; k x ^.+(do|->)$ j } + try %{ execute-keys -draft \\; k x ^.+(do|->)$ j } } } diff --git a/rc/extra/elm.kak b/rc/extra/elm.kak index f4be40f6..5ab8eade 100644 --- a/rc/extra/elm.kak +++ b/rc/extra/elm.kak @@ -31,23 +31,23 @@ add-highlighter shared/elm/code regex \b(Array|Bool|Char|Float|Int|String)\b 0:t define-command -hidden elm-filter-around-selections %{ # remove trailing white spaces - try %{ exec -draft -itersel s \h+$ d } + try %{ execute-keys -draft -itersel s \h+$ d } } define-command -hidden elm-indent-after " - exec -draft \\; k x ^\\h*(if)|(case\\h+[\\w']+\\h+of|let|in|\\{\\h+\\w+|\\w+\\h+->|[=(])$ j + execute-keys -draft \\; k x ^\\h*(if)|(case\\h+[\\w']+\\h+of|let|in|\\{\\h+\\w+|\\w+\\h+->|[=(])$ j " define-command -hidden elm-indent-on-new-line %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # copy -- comments prefix and following white spaces - try %{ exec -draft k s ^\h*\K--\h* y gh j P } + try %{ execute-keys -draft k s ^\h*\K--\h* y gh j P } # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # align to first clause - try %{ exec -draft \; k x X s ^\h*(if|then|else)?\h*(([\w']+\h+)+=)?\h*(case\h+[\w']+\h+of|let)\h+\K.* s \A|.\z & } + try %{ execute-keys -draft \; k x X s ^\h*(if|then|else)?\h*(([\w']+\h+)+=)?\h*(case\h+[\w']+\h+of|let)\h+\K.* s \A|.\z & } # filter previous line - try %{ exec -draft k : elm-filter-around-selections } + try %{ execute-keys -draft k : elm-filter-around-selections } # indent after lines beginning with condition or ending with expression or =( try %{ elm-indent-after } } diff --git a/rc/extra/git-tools.kak b/rc/extra/git-tools.kak index f5ee8d30..8f5d1c42 100644 --- a/rc/extra/git-tools.kak +++ b/rc/extra/git-tools.kak @@ -43,7 +43,7 @@ Available commands:\n-add\n-rm\n-blame\n-commit\n-checkout\n-diff\n-hide-blame\n mkfifo ${output} ( git "$@" > ${output} 2>&1 ) > /dev/null 2>&1 < /dev/null & - printf %s "eval -try-client '$kak_opt_docsclient' %{ + printf %s "evaluate-commands -try-client '$kak_opt_docsclient' %{ edit! -fifo ${output} *git* set-option buffer filetype '${filetype}' hook -group fifo buffer BufCloseFifo .* %{ @@ -55,7 +55,7 @@ Available commands:\n-add\n-rm\n-blame\n-commit\n-checkout\n-diff\n-hide-blame\n run_git_blame() { ( - printf %s "eval -client '$kak_client' %{ + printf %s "evaluate-commands -client '$kak_client' %{ try %{ add-highlighter window flag_lines GitBlame git_blame_flags } set-option buffer=$kak_bufname git_blame_flags '$kak_timestamp' }" | kak -p ${kak_session} @@ -130,9 +130,9 @@ Available commands:\n-add\n-rm\n-blame\n-commit\n-checkout\n-diff\n-hide-blame\n printf %s "edit '$msgfile' hook buffer BufWritePost '.*\Q$msgfile\E' %{ %sh{ if git commit -F '$msgfile' --cleanup=strip $@ > /dev/null; then - printf %s 'eval -client $kak_client echo -markup %{{Information}Commit succeeded}; delete-buffer' + printf %s 'evaluate-commands -client $kak_client echo -markup %{{Information}Commit succeeded}; delete-buffer' else - printf %s 'eval -client $kak_client echo -markup %{{Error}Commit failed}' + printf %s 'evaluate-commands -client $kak_client echo -markup %{{Error}Commit failed}' fi } }" } diff --git a/rc/extra/go-tools.kak b/rc/extra/go-tools.kak index ba5da4fd..439715ec 100644 --- a/rc/extra/go-tools.kak +++ b/rc/extra/go-tools.kak @@ -23,7 +23,7 @@ define-command go-complete -docstring "Complete the current selection with gocod %sh{ dir=$(mktemp -d "${TMPDIR:-/tmp}"/kak-go.XXXXXXXX) printf %s\\n "set-option buffer go_complete_tmp_dir ${dir}" - printf %s\\n "eval -no-hooks write ${dir}/buf" + printf %s\\n "evaluate-commands -no-hooks write ${dir}/buf" } %sh{ dir=${kak_opt_go_complete_tmp_dir} @@ -34,7 +34,7 @@ define-command go-complete -docstring "Complete the current selection with gocod header="${kak_cursor_line}.$((${kak_cursor_column} - $column_offset))@${kak_timestamp}" compl=$(echo "${gocode_data}" | sed 1d | awk -F ",," '{print $2 "||" $1}' | paste -s -d: -) - printf %s\\n "eval -client '${kak_client}' %{ + printf %s\\n "evaluate-commands -client '${kak_client}' %{ set-option buffer=${kak_bufname} gocode_completions '${header}:${compl}' }" | kak -p ${kak_session} ) > /dev/null 2>&1 < /dev/null & @@ -44,7 +44,7 @@ define-command go-complete -docstring "Complete the current selection with gocod define-command go-enable-autocomplete -docstring "Add gocode completion candidates to the completer" %{ set-option window completers "option=gocode_completions:%opt{completers}" hook window -group go-autocomplete InsertIdle .* %{ try %{ - exec -draft [\w\.].\z + execute-keys -draft [\w\.].\z go-complete } } alias window complete go-complete @@ -66,7 +66,7 @@ define-command -params ..1 go-format \ %sh{ dir=$(mktemp -d "${TMPDIR:-/tmp}"/kak-go.XXXXXXXX) printf %s\\n "set-option buffer go_format_tmp_dir ${dir}" - printf %s\\n "eval -no-hooks write ${dir}/buf" + printf %s\\n "evaluate-commands -no-hooks write ${dir}/buf" } %sh{ dir=${kak_opt_go_format_tmp_dir} @@ -97,7 +97,7 @@ define-command -hidden -params 1..2 gogetdoc-cmd %{ %sh{ dir=$(mktemp -d "${TMPDIR:-/tmp}"/kak-go.XXXXXXXX) printf %s\\n "set-option buffer go_doc_tmp_dir ${dir}" - printf %s\\n "eval -no-hooks write ${dir}/buf" + printf %s\\n "evaluate-commands -no-hooks write ${dir}/buf" } %sh{ dir=${kak_opt_go_doc_tmp_dir} @@ -119,12 +119,12 @@ define-command -hidden -params 1..2 gogetdoc-cmd %{ case "$1" in "info") if [ ${status} -eq 0 ]; then - printf %s\\n "eval -client '${kak_client}' %{ + printf %s\\n "evaluate-commands -client '${kak_client}' %{ info -anchor ${kak_cursor_line}.${kak_cursor_column} %@${output}@ }" | kak -p ${kak_session} else msg=$(printf %s "${output}" | cut -d' ' -f2-) - printf %s\\n "eval -client '${kak_client}' %{ + printf %s\\n "evaluate-commands -client '${kak_client}' %{ echo '${msg}' }" | kak -p ${kak_session} fi @@ -132,7 +132,7 @@ define-command -hidden -params 1..2 gogetdoc-cmd %{ "echo") if [ ${status} -eq 0 ]; then signature=$(printf %s "${output}" | sed -n 3p) - printf %s\\n "eval -client '${kak_client}' %{ + printf %s\\n "evaluate-commands -client '${kak_client}' %{ echo '${signature}' }" | kak -p ${kak_session} fi @@ -143,14 +143,14 @@ define-command -hidden -params 1..2 gogetdoc-cmd %{ file=$(printf %s "${pos}" | cut -d: -f1) line=$(printf %s "${pos}" | cut -d: -f2) col=$(printf %s "${pos}" | cut -d: -f3) - printf %s\\n "eval -client '${kak_client}' %{ - eval -try-client '${kak_opt_jumpclient}' edit -existing ${file} ${line} ${col} + printf %s\\n "evaluate-commands -client '${kak_client}' %{ + evaluate-commands -try-client '${kak_opt_jumpclient}' edit -existing ${file} ${line} ${col} try %{ focus '${kak_opt_jumpclient}' } }" | kak -p ${kak_session} fi ;; *) - printf %s\\n "eval -client '${kak_client}' %{ + printf %s\\n "evaluate-commands -client '${kak_client}' %{ echo -error %{unkown command '$1'} }" | kak -p ${kak_session} ;; diff --git a/rc/extra/haml.kak b/rc/extra/haml.kak index 856d77d8..846a4f72 100644 --- a/rc/extra/haml.kak +++ b/rc/extra/haml.kak @@ -35,19 +35,19 @@ add-highlighter shared/haml/code regex ^\h*%([A-Za-z][A-Za-z0-9_-]*)([#.][A-Za-z define-command -hidden haml-filter-around-selections %{ # remove trailing white spaces - try %{ exec -draft -itersel s \h+$ d } + try %{ execute-keys -draft -itersel s \h+$ d } } define-command -hidden haml-indent-on-new-line %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # copy '/' comment prefix and following white spaces - try %{ exec -draft k s ^\h*\K/\h* y gh j P } + try %{ execute-keys -draft k s ^\h*\K/\h* y gh j P } # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # filter previous line - try %{ exec -draft k : haml-filter-around-selections } + try %{ execute-keys -draft k : haml-filter-around-selections } # indent after lines beginning with : or - - try %{ exec -draft k ^\h*[:-] j } + try %{ execute-keys -draft k ^\h*[:-] j } } } diff --git a/rc/extra/hbs.kak b/rc/extra/hbs.kak index 4f18299e..3c817e75 100644 --- a/rc/extra/hbs.kak +++ b/rc/extra/hbs.kak @@ -36,19 +36,19 @@ add-highlighter shared/hbs/block-expression regex ((\w|-)+)=(('|").*?('|")) 1:at define-command -hidden hbs-filter-around-selections %{ # remove trailing white spaces - try %{ exec -draft -itersel s \h+$ d } + try %{ execute-keys -draft -itersel s \h+$ d } } define-command -hidden hbs-indent-on-new-line %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # copy '/' comment prefix and following white spaces - try %{ exec -draft k s ^\h*\K/\h* y j p } + try %{ execute-keys -draft k s ^\h*\K/\h* y j p } # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # filter previous line - try %{ exec -draft k : hbs-filter-around-selections } + try %{ execute-keys -draft k : hbs-filter-around-selections } # indent after lines beginning with : or - - try %{ exec -draft k ^\h*[:-] j } + try %{ execute-keys -draft k ^\h*[:-] j } } } diff --git a/rc/extra/jedi.kak b/rc/extra/jedi.kak index a9b4dfbe..95eaa912 100644 --- a/rc/extra/jedi.kak +++ b/rc/extra/jedi.kak @@ -8,11 +8,11 @@ define-command jedi-complete -docstring "Complete the current selection" %{ dir=$(mktemp -d "${TMPDIR:-/tmp}"/kak-jedi.XXXXXXXX) mkfifo ${dir}/fifo printf %s\\n "set-option buffer jedi_tmp_dir ${dir}" - printf %s\\n "eval -no-hooks write ${dir}/buf" + printf %s\\n "evaluate-commands -no-hooks write ${dir}/buf" } %sh{ dir=${kak_opt_jedi_tmp_dir} - printf %s\\n "eval -draft %{ edit! -fifo ${dir}/fifo *jedi-output* }" + printf %s\\n "evaluate-commands -draft %{ edit! -fifo ${dir}/fifo *jedi-output* }" ( cd $(dirname ${kak_buffile}) header="${kak_cursor_line}.${kak_cursor_column}@${kak_timestamp}" @@ -24,7 +24,7 @@ define-command jedi-complete -docstring "Complete the current selection" %{ print(':'.join([(str(c.name).replace("|", "\\|") + "|" + str(c.docstring()).replace("|", "\\|")).replace(":", "\\:") + "|" + str(c.name).replace("|", "\\|") for c in script.completions()]).replace("'", r"\\\\'")) END ) - printf %s\\n "eval -client ${kak_client} 'echo completed; set-option %{buffer=${kak_buffile}} jedi_completions \'${header}:${compl}\''" | kak -p ${kak_session} + printf %s\\n "evaluate-commands -client ${kak_client} 'echo completed; set-option %{buffer=${kak_buffile}} jedi_completions \'${header}:${compl}\''" | kak -p ${kak_session} rm -r ${dir} ) > /dev/null 2>&1 < /dev/null & } @@ -33,7 +33,7 @@ define-command jedi-complete -docstring "Complete the current selection" %{ define-command jedi-enable-autocomplete -docstring "Add jedi completion candidates to the completer" %{ set-option window completers "option=jedi_completions:%opt{completers}" hook window -group jedi-autocomplete InsertIdle .* %{ try %{ - exec -draft \..\z + execute-keys -draft \..\z echo 'completing...' jedi-complete } } diff --git a/rc/extra/modeline.kak b/rc/extra/modeline.kak index 8e87d1e6..17fcd30d 100644 --- a/rc/extra/modeline.kak +++ b/rc/extra/modeline.kak @@ -94,9 +94,9 @@ define-command -hidden modeline-parse-impl %{ # [text]{white}{vi:|vim:|ex:}[white]{options} # [text]{white}{vi:|vim:|Vim:|ex:}[white]se[t] {options}:[text] define-command modeline-parse -docstring "Read and interpret vi-format modelines at the beginning/end of the buffer" %{ - try %{ eval -draft %{ - exec \%s\A|.\z %opt{modelines}k %opt{modelines}X \ + try %{ evaluate-commands -draft %{ + execute-keys \%s\A|.\z %opt{modelines}k %opt{modelines}X \ s^\S*?\s+?(vim?|kak(oune)?):\s?[^\n]+ - eval -draft -itersel modeline-parse-impl + evaluate-commands -draft -itersel modeline-parse-impl } } } diff --git a/rc/extra/moon.kak b/rc/extra/moon.kak index f57a281d..2aa3188d 100644 --- a/rc/extra/moon.kak +++ b/rc/extra/moon.kak @@ -56,36 +56,36 @@ define-command moon-alternative-file -docstring 'Jump to the alternate file (imp }} define-command -hidden moon-filter-around-selections %{ - eval -draft -itersel %{ - exec + evaluate-commands -draft -itersel %{ + execute-keys # remove trailing white spaces - try %{ exec -draft s \h + $ d } + try %{ execute-keys -draft s \h + $ d } } } define-command -hidden moon-indent-on-char %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # align _else_ statements to start - try %{ exec -draft ^ \h * (else(if)?) $ ^ \h * (if|unless|when) s \A | \z \' } + try %{ execute-keys -draft ^ \h * (else(if)?) $ ^ \h * (if|unless|when) s \A | \z \' } # align _when_ to _switch_ then indent - try %{ exec -draft ^ \h * (when) $ ^ \h * (switch) s \A | \z \' \' } + try %{ execute-keys -draft ^ \h * (when) $ ^ \h * (switch) s \A | \z \' \' } # align _catch_ and _finally_ to _try_ - try %{ exec -draft ^ \h * (catch|finally) $ ^ \h * (try) s \A | \z \' } + try %{ execute-keys -draft ^ \h * (catch|finally) $ ^ \h * (try) s \A | \z \' } } } define-command -hidden moon-indent-on-new-line %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # copy -- comment prefix and following white spaces - try %{ exec -draft k s ^ \h * \K -- \h * y gh j P } + try %{ execute-keys -draft k s ^ \h * \K -- \h * y gh j P } # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # filter previous line - try %{ exec -draft k : moon-filter-around-selections } + try %{ execute-keys -draft k : moon-filter-around-selections } # indent after start structure - try %{ exec -draft k ^ \h * (class|else(if)?|for|if|switch|unless|when|while|with) \b | ([:=]|[-=]>) $ j } + try %{ execute-keys -draft k ^ \h * (class|else(if)?|for|if|switch|unless|when|while|with) \b | ([:=]|[-=]>) $ j } # deindent after return statements - try %{ exec -draft k ^ \h * (break|return) \b j } + try %{ execute-keys -draft k ^ \h * (break|return) \b j } } } diff --git a/rc/extra/php.kak b/rc/extra/php.kak index d3993f5d..13213d97 100644 --- a/rc/extra/php.kak +++ b/rc/extra/php.kak @@ -34,26 +34,26 @@ add-highlighter shared/php/code regex \b(__halt_compiler|abstract|and|array|as|b define-command -hidden php-filter-around-selections %{ # remove trailing white spaces - try %{ exec -draft -itersel s \h+$ d } + try %{ execute-keys -draft -itersel s \h+$ d } } define-command -hidden php-indent-on-char %< - eval -draft -itersel %< + evaluate-commands -draft -itersel %< # align closer token to its opener when alone on a line - try %/ exec -draft ^\h+[]}]$ m s \A|.\z 1 / + try %/ execute-keys -draft ^\h+[]}]$ m s \A|.\z 1 / > > define-command -hidden php-indent-on-new-line %< - eval -draft -itersel %< + evaluate-commands -draft -itersel %< # copy // comments prefix and following white spaces - try %{ exec -draft k s ^\h*\K#\h* y gh j P } + try %{ execute-keys -draft k s ^\h*\K#\h* y gh j P } # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # filter previous line - try %{ exec -draft k : php-filter-around-selections } + try %{ execute-keys -draft k : php-filter-around-selections } # indent after lines beginning / ending with opener token - try %_ exec -draft k ^\h*[[{]|[[{]$ j _ + try %_ execute-keys -draft k ^\h*[[{]|[[{]$ j _ > > diff --git a/rc/extra/pony.kak b/rc/extra/pony.kak index eecbc3d3..ce96fd48 100644 --- a/rc/extra/pony.kak +++ b/rc/extra/pony.kak @@ -65,17 +65,17 @@ add-highlighter shared/pony/comment fill comment # ‾‾‾‾‾‾‾‾ define-command -hidden pony-indent-on-new-line %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # preserve previous line indent - try %{ exec -draft K } + try %{ execute-keys -draft K } # cleanup trailing whitespaces from previous line - try %{ exec -draft k s \h+$ d } + try %{ execute-keys -draft k s \h+$ d } # copy '//' comment prefix and following white spaces - # try %{ exec -draft k x s ^\h*//\h* y jgh P } + # try %{ execute-keys -draft k x s ^\h*//\h* y jgh P } # indent after line ending with : - try %{ exec -draft k x (do|try|then|else|:|=>)$ j } + try %{ execute-keys -draft k x (do|try|then|else|:|=>)$ j } # else, end are always de-indented - try %{ exec -draft k x (else|end):$ k x s ^\h* y j x ^" J } + try %{ execute-keys -draft k x (else|end):$ k x s ^\h* y j x ^" J } } } @@ -87,7 +87,7 @@ hook -group pony-highlight global WinSetOption filetype=pony %{ add-highlighter hook global WinSetOption filetype=pony %{ hook window InsertChar \n -group pony-indent pony-indent-on-new-line # cleanup trailing whitespaces on current line insert end - hook window InsertEnd .* -group pony-indent %{ try %{ exec -draft \; s ^\h+$ d } } + hook window InsertEnd .* -group pony-indent %{ try %{ execute-keys -draft \; s ^\h+$ d } } } hook global WinSetOption filetype=pony %{ diff --git a/rc/extra/pug.kak b/rc/extra/pug.kak index 31efb34c..927de876 100644 --- a/rc/extra/pug.kak +++ b/rc/extra/pug.kak @@ -46,19 +46,19 @@ add-highlighter shared/pug/code regex ((?:\.[A-Za-z][A-Za-z0-9_-]* define-command -hidden pug-filter-around-selections %{ # remove trailing white spaces - try %{ exec -draft -itersel s \h+$ d } + try %{ execute-keys -draft -itersel s \h+$ d } } define-command -hidden pug-indent-on-new-line %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # filter previous line - try %{ exec -draft k : pug-filter-around-selections } + try %{ execute-keys -draft k : pug-filter-around-selections } # copy '//', '|', '-' or '(!)=' prefix and following whitespace - try %{ exec -draft k s ^\h*\K[/|!=-]{1,2}\h* y gh j P } + try %{ execute-keys -draft k s ^\h*\K[/|!=-]{1,2}\h* y gh j P } # indent unless we copied something above - try %{ exec -draft b s \S g l } + try %{ execute-keys -draft b s \S g l } } } diff --git a/rc/extra/racer.kak b/rc/extra/racer.kak index 73b3a6fd..a1bb4866 100644 --- a/rc/extra/racer.kak +++ b/rc/extra/racer.kak @@ -5,7 +5,7 @@ define-command racer-complete -docstring "Complete the current selection with ra %sh{ dir=$(mktemp -d "${TMPDIR:-/tmp}"/kak-racer.XXXXXXXX) printf %s\\n "set-option buffer racer_tmp_dir ${dir}" - printf %s\\n "eval -no-hooks %{ write ${dir}/buf }" + printf %s\\n "evaluate-commands -no-hooks %{ write ${dir}/buf }" } %sh{ dir=${kak_opt_racer_tmp_dir} @@ -44,7 +44,7 @@ define-command racer-complete -docstring "Complete the current selection with ra print candidate }' ) - printf %s\\n "eval -client '${kak_client}' %{ + printf %s\\n "evaluate-commands -client '${kak_client}' %{ set-option buffer=${kak_bufname} racer_completions %@${compl}@ }" | kak -p ${kak_session} rm -r ${dir} @@ -55,7 +55,7 @@ define-command racer-complete -docstring "Complete the current selection with ra define-command racer-enable-autocomplete -docstring "Add racer completion candidates to the completer" %{ set-option window completers "option=racer_completions:%opt{completers}" hook window -group racer-autocomplete InsertIdle .* %{ try %{ - exec -draft ([\w\.]|::).\z + execute-keys -draft ([\w\.]|::).\z racer-complete } } alias window complete racer-complete diff --git a/rc/extra/ragel.kak b/rc/extra/ragel.kak index f93bdf88..39b072e0 100644 --- a/rc/extra/ragel.kak +++ b/rc/extra/ragel.kak @@ -31,27 +31,27 @@ add-highlighter shared/ragel/code regex \b(action|alnum|alpha|any|ascii|case|cnt define-command -hidden ragel-filter-around-selections %{ # remove trailing white spaces - try %{ exec -draft -itersel s \h+$ d } + try %{ execute-keys -draft -itersel s \h+$ d } } define-command -hidden ragel-indent-on-char %< - eval -draft -itersel %< + evaluate-commands -draft -itersel %< # align closer token to its opener when alone on a line - try %< exec -draft ^\h+[]})]$ m s \A|.\z 1 > - try %< exec -draft ^\h+ [*]$ [*]$ s \A|.\z 1 > + try %< execute-keys -draft ^\h+[]})]$ m s \A|.\z 1 > + try %< execute-keys -draft ^\h+ [*]$ [*]$ s \A|.\z 1 > > > define-command -hidden ragel-indent-on-new-line %< - eval -draft -itersel %< + evaluate-commands -draft -itersel %< # copy _#_ comment prefix and following white spaces - try %{ exec -draft k s ^\h*\K#\h* y gh j P } + try %{ execute-keys -draft k s ^\h*\K#\h* y gh j P } # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # filter previous line - try %{ exec -draft k : ragel-filter-around-selections } + try %{ execute-keys -draft k : ragel-filter-around-selections } # indent after lines ending with opener token - try %< exec -draft k [[{(*]$ j > + try %< execute-keys -draft k [[{(*]$ j > > > diff --git a/rc/extra/ranger.kak b/rc/extra/ranger.kak index 48687b5c..4ba2a64f 100644 --- a/rc/extra/ranger.kak +++ b/rc/extra/ranger.kak @@ -19,7 +19,7 @@ All the optional arguments are forwarded to the ranger utility} \ ranger $@ --cmd " \ map eval \ fm.execute_console('shell \ - echo eval -client $kak_client edit {file} | \ + echo evaluate-commands -client $kak_client edit {file} | \ kak -p $kak_session; \ tmux select-pane -t $kak_client_env_TMUX_PANE'.format(file=fm.thisfile.path)) \ if fm.thisfile.is_file else fm.execute_console('move right=1')" @@ -28,7 +28,7 @@ All the optional arguments are forwarded to the ranger utility} \ ranger $@ --cmd "'"'" \ map eval \ fm.execute_console('shell \ - echo eval -client $kak_client edit {file} | \ + echo evaluate-commands -client $kak_client edit {file} | \ kak -p $kak_session; \ xdotool windowactivate $kak_client_env_WINDOWID'.format(file=fm.thisfile.path)) \ if fm.thisfile.is_file else fm.execute_console('move right=1')"'"' < /dev/null > /dev/null 2>&1 & diff --git a/rc/extra/sass.kak b/rc/extra/sass.kak index 66f302ea..f3ba8f3f 100644 --- a/rc/extra/sass.kak +++ b/rc/extra/sass.kak @@ -31,19 +31,19 @@ add-highlighter shared/sass/code regex !important 0:keyword define-command -hidden sass-filter-around-selections %{ # remove trailing white spaces - try %{ exec -draft -itersel s \h+$ d } + try %{ execute-keys -draft -itersel s \h+$ d } } define-command -hidden sass-indent-on-new-line %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # copy '/' comment prefix and following white spaces - try %{ exec -draft k s ^\h*\K/\h* y gh j P } + try %{ execute-keys -draft k s ^\h*\K/\h* y gh j P } # preserve previous line indent - try %{ exec -draft \; K } + try %{ execute-keys -draft \; K } # filter previous line - try %{ exec -draft k : sass-filter-around-selections } + try %{ execute-keys -draft k : sass-filter-around-selections } # avoid indent after properties and comments - try %{ exec -draft k [:/] j } + try %{ execute-keys -draft k [:/] j } } } diff --git a/rc/extra/taskpaper.kak b/rc/extra/taskpaper.kak index c1cbc93b..1a832ad1 100644 --- a/rc/extra/taskpaper.kak +++ b/rc/extra/taskpaper.kak @@ -23,13 +23,13 @@ add-highlighter shared/taskpaper regex (([a-z]+://\S+)|((mailto:)[\w+-]+@\S+)) 0 # ‾‾‾‾‾‾‾‾ define-command -hidden taskpaper-indent-on-new-line %{ - eval -draft -itersel %{ + evaluate-commands -draft -itersel %{ # preserve previous line indent - try %{ exec -draft \;K } + try %{ execute-keys -draft \;K } ## If the line above is a project indent with a tab - try %{ exec -draft Z k ^\h*([^:\n]+): z i } + try %{ execute-keys -draft Z k ^\h*([^:\n]+): z i } # cleanup trailing white spaces on previous line - try %{ exec -draft k s \h+$ d } + try %{ execute-keys -draft k s \h+$ d } } } diff --git a/src/commands.cc b/src/commands.cc index e0da8d58..761fc665 100644 --- a/src/commands.cc +++ b/src/commands.cc @@ -1669,9 +1669,9 @@ void context_wrap(const ParametersParser& parser, Context& context, Func func) } const CommandDesc exec_string_cmd = { + "execute-keys", "exec", - nullptr, - "exec : execute given keys as if entered by user", + "execute-keys : execute given keys as if entered by user", context_wrap_params, CommandFlags::None, CommandHelper{}, @@ -1694,9 +1694,9 @@ const CommandDesc exec_string_cmd = { }; const CommandDesc eval_string_cmd = { + "evaluate-commands", "eval", - nullptr, - "eval ...: execute commands as if entered by user", + "evaluate-commands ...: execute commands as if entered by user", context_wrap_params, CommandFlags::None, CommandHelper{},