From a7d4c8d5ca59d977642b04688869d98632f1805d Mon Sep 17 00:00:00 2001 From: Akshay Nair Date: Sat, 21 Mar 2026 23:03:12 +0530 Subject: Fix repl module + refactor custom modes --- autoload/repl.kak | 150 --------------------------------------- autoload/repl/repl.kak | 137 +++++++++++++++++++++++++++++++++++ autoload/repl/repl_modes.kak | 67 +++++++++++++++++ autoload/snippets/typescript.kak | 9 +++ 4 files changed, 213 insertions(+), 150 deletions(-) delete mode 100644 autoload/repl.kak create mode 100644 autoload/repl/repl.kak create mode 100644 autoload/repl/repl_modes.kak (limited to 'autoload') diff --git a/autoload/repl.kak b/autoload/repl.kak deleted file mode 100644 index d7b43d9..0000000 --- a/autoload/repl.kak +++ /dev/null @@ -1,150 +0,0 @@ -declare-user-mode repl -map global normal ': enter-user-mode repl' -docstring 'Repl mode' -map global repl ': enter-user-mode repl-mode-select' -docstring 'Select repl' -map global repl ': xrepl-begin' -docstring 'Start repl' -map global repl t ': xrepl-begin' -docstring 'Start repl' -map global repl l ': xrepl-send-command' -docstring 'Send to selection to repl' -map global repl ': xrepl-send-paragraph' -docstring 'Send paragraph to repl' -map global repl r ': xrepl-send-keys Enter' -docstring 'Send return key to repl' -map global repl c ': xrepl-send-keys C-c' -docstring 'Send Ctrl+c interrupt to repl' -map global repl p ': xrepl-send-prompt' -docstring 'Prompt for text to send to repl' -map global repl q ': xrepl-quit' -docstring 'Quit repl' - -declare-option bool xrepl_running false; -# declare-option int xrepl_tmux_repl_id; -declare-option str xrepl_current_name; -declare-option str xrepl_current_cmd; -declare-option str xrepl_current_transform; -declare-option str xrepl_current_split_size; -declare-option bool xrepl_current_split_vertical false; -declare-option bool xrepl_current_clear_screen false; - -# TODO: Use register set to selection (paragraph) instead of selection -# TODO: Add env -# TODO: Migrate curly -# TODO: Preserve original selection with send paragraph -# TODO: Sometimes repl stops working (tmux repl id changed?) - -declare-user-mode repl-mode-select -define-command define-repl-mode -params 4 %{ - # TODO: Use a hidden command and use for keymap - map %arg{1} repl-mode-select %arg{2} -docstring %arg{3} %sh{ - kak_escape() { printf "'"; printf '%s' "$1" | sed "s/'/''/g"; printf "'"; } - printf ": xrepl-quit" - printf ": set global xrepl_current_name '$3'" - printf ": set global xrepl_current_cmd \"\$SHELL\"" - printf ": set global xrepl_current_transform \"\"" - printf ": set global xrepl_current_split_size 45%%" - printf ": set global xrepl_current_split_vertical false" - printf ": set global xrepl_current_clear_screen false" - printf ": evaluate-commands $(kak_escape "$(echo "$4" | tr '\n' ';')")" - printf ": xrepl-begin" - } -} - -define-repl-mode global s 'Shell' %{ set global xrepl_current_cmd '$SHELL' } -define-repl-mode global n 'Node' %{ set global xrepl_current_cmd 'node' } -define-repl-mode global a 'AI: Local' %{ set global xrepl_current_cmd 'aichat' } -define-repl-mode global g 'AI: Gemini' %{ set global xrepl_current_cmd 'gemini' } - -hook global BufSetOption filetype=haskell %{ - define-repl-mode buffer h 'Haskell: cabal test' %{ - set global xrepl_current_cmd 'cabal test' - set global xrepl_current_clear_screen true - } -} - -hook global BufSetOption filetype=ruby %{ - define-repl-mode buffer r 'Rspec' %{ - # TODO: Make generic - set global xrepl_current_cmd 'docker compose exec shape-api -T sh' - set global xrepl_current_transform 'cat > /dev/null - path="$kak_buffile" - if [ $kak_cursor_line -gt 5 ]; then - path="$path:$kak_cursor_line" - fi - echo "rspec -fd $path" - ' - set global xrepl_current_clear_screen true - } -} - -hook global BufSetOption filetype=clojure %{ - # TODO: Just temporary for messing around. Remove module name - map buffer repl r ': repl-send-text %{(require ''[pluribus.core :as p] :reload)}; xrepl-send-keys Enter' -docstring 'Cljs reload' - define-repl-mode buffer j 'Clojurescript repl' %{ - set global xrepl_current_cmd 'clj -M -m cljs.main --repl-opts "{:launch-browser false}" --compile pluribus.core --repl' - set global xrepl_current_split_size 30%% - set global xrepl_current_split_vertical true - } -} - -hook global BufSetOption filetype=(?:javascript|typescript|jsx|tsx) %{ - # TODO: Search for root cypress config file and cd into it - define-repl-mode buffer c 'Cypress' %{ - set global xrepl_current_cmd '$SHELL' - set global xrepl_current_transform 'cat > /dev/null - echo "npx cypress run --headless --e2e --spec ''$kak_buffile'';" - ' - set global xrepl_current_clear_screen true - } - define-repl-mode global j 'Jest' %{ - set global xrepl_current_cmd '$SHELL' - set global xrepl_current_transform 'cat > /dev/null - echo "sh -c \\"cd ''$(dirname "$kak_buffile")''; npx jest --runTestsByPath ''$kak_buffile''\\";" - ' - set global xrepl_current_clear_screen true - } -} - -define-command xrepl-send-prompt %{ - prompt -buffer-completion 'Send to repl: ' %{ repl-send-text %val{text} } -} - -define-command xrepl-send-command %{ - evaluate-commands -draft %sh{ - if [ "$kak_opt_xrepl_current_clear_screen" == "true" ]; then - echo "xrepl-send-keys C-l" - fi - - transform="$kak_opt_xrepl_current_transform" - value="$kak_selection" - if ! [ -z "$transform" ]; then - export kak_buffile kak_selection kak_selection_desc kak_cursor_line kak_cursor_column - value=$(echo "$kak_selection" | sh -c "$transform") - fi - echo -e "repl-send-text %{$value\n}" - } -} - -define-command xrepl-send-paragraph %{ - execute-keys 'p' - xrepl-send-command -} - -define-command xrepl-send-keys -params 1.. %{ - nop %sh{ tmux send-keys -t "$kak_opt_tmux_repl_id" "$@" } -} - -define-command xrepl-quit %{ - set-option global xrepl_running false - try %{ nop %sh{ - if ! [ -z "$kak_opt_tmux_repl_id" ]; then - tmux kill-pane -t "$kak_opt_tmux_repl_id"; - fi - } } -} - -define-command xrepl-begin %{ - evaluate-commands %sh{ - if [ "$kak_opt_xrepl_running" = "false" ]; then - init_cmd="$kak_opt_xrepl_current_cmd" - if [ -z "$init_cmd" ]; then init_cmd="$SHELL"; fi - echo "info %opt{xrepl_current_name}" - echo "set-option global xrepl_running true" - cmd=$([ "$kak_opt_xrepl_current_split_vertical" == "true" ] && echo "tmux-repl-vertical" || echo "tmux-repl-horizontal") - echo "$cmd -l $kak_opt_xrepl_current_split_size $init_cmd" - echo "nop %sh{ tmux last-pane }" - fi - } -} diff --git a/autoload/repl/repl.kak b/autoload/repl/repl.kak new file mode 100644 index 0000000..bd47a67 --- /dev/null +++ b/autoload/repl/repl.kak @@ -0,0 +1,137 @@ +declare-user-mode repl +map global normal ': enter-user-mode repl' -docstring 'Repl mode' +map global repl ': enter-user-mode repl-mode-select' -docstring 'Select repl' +map global repl ': xrepl-begin' -docstring 'Start repl' +map global repl t ': xrepl-begin' -docstring 'Start repl' +map global repl l ': xrepl-send-command' -docstring 'Send to selection to repl' +map global repl ': xrepl-send-paragraph' -docstring 'Send paragraph to repl' +map global repl r ': xrepl-send-keys Enter' -docstring 'Send return key to repl' +map global repl c ': xrepl-send-keys C-c' -docstring 'Send Ctrl+c interrupt to repl' +map global repl p ': xrepl-send-prompt' -docstring 'Prompt for text to send to repl' +map global repl q ': xrepl-quit' -docstring 'Quit repl' + +declare-option bool xrepl_running false; +declare-option str xrepl_tmux_id; +declare-option str xrepl_current_name; +declare-option str xrepl_current_cmd; +declare-option str xrepl_current_transform; +declare-option str xrepl_current_split_size; +declare-option bool xrepl_current_split_vertical false; +declare-option bool xrepl_current_clear_screen false; + +# TODO: "Custom" repl mode +# TODO: Use register set to selection (paragraph) instead of selection +# TODO: Add env +# TODO: Preserve original selection with send paragraph + +declare-user-mode repl-mode-select +define-command define-repl-mode -params 4 %{ + # TODO: Use a hidden command and use for keymap + # define-command %sh{ echo "repl-mode--$2" } %{ + # xrepl-quit + # set global xrepl_current_name %arg{3} + # set global xrepl_current_cmd "$SHELL" + # set global xrepl_current_transform "" + # set global xrepl_current_split_size '45%' + # set global xrepl_current_split_vertical false + # set global xrepl_current_clear_screen false + # evaluate-commands %sh{ + # kak_escape() { printf "'"; printf '%s' "$1" | sed "s/'/''/g"; printf "'"; } + # kak_escape "$(echo "$4" | tr '\n' ';')" + # } + # xrepl-begin + # } + map %arg{1} repl-mode-select %arg{2} -docstring %arg{3} %sh{ + kak_escape() { printf "'"; printf '%s' "$1" | sed "s/'/''/g"; printf "'"; } + printf ": xrepl-quit" + printf ": set global xrepl_current_name '$3'" + printf ": set global xrepl_current_cmd \"\$SHELL\"" + printf ": set global xrepl_current_transform \"\"" + printf ": set global xrepl_current_split_size 45%%" + printf ": set global xrepl_current_split_vertical false" + printf ": set global xrepl_current_clear_screen false" + printf ": evaluate-commands $(kak_escape "$(echo "$4" | tr '\n' ';')")" + printf ": xrepl-begin" + } +} + +define-command xrepl-send-prompt %{ + prompt -buffer-completion 'Send to repl: ' %{ xrepl-send-text %val{text} } +} + +define-command xrepl-send-command %{ + evaluate-commands -draft %sh{ + if [ "$kak_opt_xrepl_current_clear_screen" == "true" ]; then + echo "xrepl-send-keys C-l" + fi + + transform="$kak_opt_xrepl_current_transform" + value="$kak_selection" + if ! [ -z "$transform" ]; then + # Available values in transform script + export kak_buffile kak_selection kak_selection_desc kak_cursor_line kak_cursor_column kak_config + value=$(echo "$kak_selection" | sh -c "$transform") + fi + echo -e "xrepl-send-text %{$value\n}" + } +} + +define-command xrepl-send-paragraph %{ + execute-keys 'p' + xrepl-send-command +} + +define-command xrepl-send-keys -params 1.. %{ + nop %sh{ tmux send-keys -t "$kak_opt_xrepl_tmux_id" "$@" } +} + +define-command xrepl-quit %{ + set-option global xrepl_running false + try %{ nop %sh{ + if ! [ -z "$kak_opt_xrepl_tmux_id" ]; then + tmux kill-pane -t "$kak_opt_xrepl_tmux_id"; + fi + } } +} + +define-command xrepl-begin %{ + evaluate-commands %sh{ + if [ "$kak_opt_xrepl_running" = "false" ]; then + init_cmd="$kak_opt_xrepl_current_cmd" + if [ -z "$init_cmd" ]; then init_cmd="$SHELL"; fi + # echo "info %opt{xrepl_current_name}" + echo "set-option global xrepl_running true" + cmd=$([ "$kak_opt_xrepl_current_split_vertical" == "true" ] && echo "tmux-xrepl-vertical" || echo "tmux-xrepl-horizontal") + echo "$cmd -l $kak_opt_xrepl_current_split_size $init_cmd" + echo "nop %sh{ tmux last-pane }" + fi + } +} + +define-command -hidden -params 1.. tmux-xrepl-impl %{ + evaluate-commands %sh{ + if [ -z "$TMUX" ]; then + echo 'fail This command is only available in a tmux session' + exit + fi + tmux_args="split-window $1 -t ${kak_client_env_TMUX_PANE}" + shift + repl_pane_id=$(tmux $tmux_args -P -F '#{pane_id}' "$@") + printf "set-option current xrepl_tmux_id '%s'" "$repl_pane_id" + } +} + +define-command tmux-xrepl-vertical -params 0.. %{ tmux-xrepl-impl '-v' %arg{@} } +define-command tmux-xrepl-horizontal -params 0.. %{ tmux-xrepl-impl '-h' %arg{@} } + +define-command xrepl-send-text -params 0..1 %{ + evaluate-commands %sh{ + if [ $# -eq 0 ]; then + tmux set-buffer -b kak_selection -- "${kak_selection}" + else + tmux set-buffer -b kak_selection -- "$1" + fi + tmux paste-buffer -b kak_selection -t "$kak_opt_xrepl_tmux_id" || + echo 'fail tmux-send-text: failed to send text, see *debug* buffer for details' + } +} diff --git a/autoload/repl/repl_modes.kak b/autoload/repl/repl_modes.kak new file mode 100644 index 0000000..f059789 --- /dev/null +++ b/autoload/repl/repl_modes.kak @@ -0,0 +1,67 @@ +define-repl-mode global s 'Shell' %{ set global xrepl_current_cmd '$SHELL' } +define-repl-mode global n 'Node' %{ set global xrepl_current_cmd 'node' } +define-repl-mode global a 'AI: Claude' %{ set global xrepl_current_cmd 'claude' } + +# TODO: doesnt work +# define-repl-mode global C 'Custom' %{ +# prompt -shell-completion 'Command: ' ' +# set global xrepl_current_cmd "node" +# ' +# } + +hook global BufSetOption filetype=haskell %{ + define-repl-mode buffer h 'Haskell: cabal test' %{ + set global xrepl_current_cmd 'cabal test' + set global xrepl_current_clear_screen true + } +} + +hook global BufSetOption filetype=ruby %{ + # TODO: Make generic + define-repl-mode buffer c 'Rails console' %{ + set global xrepl_current_cmd "just server-rails c" + } + define-repl-mode buffer r 'Rspec' %{ + set global xrepl_current_cmd '$SHELL' + set global xrepl_current_transform 'cat > /dev/null + path="$kak_buffile" + if [ $kak_cursor_line -gt 5 ]; then + path="$path:$kak_cursor_line" + fi + KAK_BUNDLE_EXEC=${KAK_BUNDLE_EXEC:-"bundle exec"} + echo "$KAK_BUNDLE_EXEC rspec -fd $path" + ' + set global xrepl_current_clear_screen true + } +} + +hook global BufSetOption filetype=(?:javascript|typescript|jsx|tsx) %{ + # TODO: Search for root cypress config file and cd into it + # set global xrepl_current_cmd '(echo "::$kak_config::" | tee foob) && ' + define-repl-mode buffer c 'Cypress' %{ + set global xrepl_current_cmd '$SHELL' + set global xrepl_current_transform 'cat > /dev/null + cypress_config_files="cypress.config.json cypress.config.ts cypress.config.js" + project=$($kak_config/scripts/utils.sh find_closest "$kak_buffile" $cypress_config_files) + echo "npx cypress run --headless --e2e -P" "''$project''" "--spec ''$kak_buffile'';" + ' + set global xrepl_current_clear_screen true + } + define-repl-mode global j 'Jest' %{ + set global xrepl_current_cmd '$SHELL' + set global xrepl_current_transform 'cat > /dev/null + echo "sh -c \\"cd ''$(dirname "$kak_buffile")''; npx jest --runTestsByPath ''$kak_buffile''\\";" + ' + set global xrepl_current_clear_screen true + } +} + +hook global BufSetOption filetype=clojure %{ + # TODO: Just temporary for messing around. Remove module name + map buffer repl r ': xrepl-send-text %{(require ''[pluribus.core :as p] :reload)}; xrepl-send-keys Enter' -docstring 'Cljs reload' + define-repl-mode buffer j 'Clojurescript repl' %{ + set global xrepl_current_cmd 'clj -M -m cljs.main --repl-opts "{:launch-browser false}" --compile pluribus.core --repl' + set global xrepl_current_split_size 30%% + set global xrepl_current_split_vertical true + } +} diff --git a/autoload/snippets/typescript.kak b/autoload/snippets/typescript.kak index f2d3e8f..4b17109 100644 --- a/autoload/snippets/typescript.kak +++ b/autoload/snippets/typescript.kak @@ -1,6 +1,7 @@ hook global BufSetOption filetype=(?:javascript|typescript|jsx|tsx) %{ define-snippet buffer snip-react-component define-snippet buffer snip-react-usestate + define-snippet buffer snip-function } define-command snip-react-usestate %{ @@ -25,3 +26,11 @@ define-command snip-react-component %{ execute-keys "};kwlt;" } } + +define-command snip-function %{ + prompt 'Name: ' %{ + execute-keys ",iconst %val{text} = () => {" + execute-keys " return 0;" + execute-keys "};kwlt;" + } +} -- cgit v1.3.1