fix: forward all arguments when setting extra toggle keys (#45)

Author: loichyan

CHANGELOG.md

@@ -46,10 +46,12 @@ follows <https://www.conventionalcommits.org/en/v1.0.0/> to track changes.
 ### Fixed
 
 - Support OSX's ancient Bash ([#44])
+- Forward all arguments when setting specified toggle keys ([#45])
 
 [#42]: https://github.com/loichyan/tmux-toggle-popup/pull/42
 [#43]: https://github.com/loichyan/tmux-toggle-popup/pull/43
 [#44]: https://github.com/loichyan/tmux-toggle-popup/pull/44
+[#45]: https://github.com/loichyan/tmux-toggle-popup/pull/45
 [NixOS/nixpkgs#428294]: https://github.com/NixOS/nixpkgs/pull/428294
 [@szaffarano]: https://github.com/szaffarano
 

src/toggle.sh

@@ -73,7 +73,7 @@ prepare_open() {
 	# Create temporary toggle keys in the opened popup
 	# shellcheck disable=SC2206
 	for k in "${toggle_keys[@]}"; do
-		open_cmds+=(bind $k run "#{@popup-toggle} --name='$name' --toggle-mode='$toggle_mode'" \;)
+		open_cmds+=(bind $k run "#{@popup-toggle} $(escape "${args[@]}")" \;)
 		on_cleanup+=(unbind $k \;)
 	done
 
@@ -193,7 +193,7 @@ main() {
 	tmux set default-shell "/bin/sh" \; popup "${display_args[@]}" "$open_script"
 
 	# Undo temporary changes on the popup server
-	if [[ ${#on_cleanup} -gt 0 ]]; then
+	if [[ -z $opened_name && ${#on_cleanup} -gt 0 ]]; then
 		# Ignore error if the server has already stopped
 		tmux -N "${popup_socket[@]}" "${on_cleanup[@]}" 2>/dev/null || true
 	fi
@@ -202,4 +202,5 @@ main() {
 	if parse_cmds "$after_close"; then tmux "${cmds[@]}"; fi
 }
 
+args=("$@")
 main "$@"

src/toggle_tests.sh

@@ -112,3 +112,18 @@ t_toggle_mode="force-open"
 t_opened_name="p_open_nested_1"
 begin_test "$test_name"
 test_toggle --name="p_open_nested_2"
+
+test_name="open_with_toggle_key"
+exit_codes=(0 0 0)
+t_toggle_mode="switch"
+t_opened_name=""
+begin_test "$test_name"
+test_toggle --name="p_toggle_key" --toggle-key="-T root M-p" --toggle-key="-n M-o"
+
+# Open nested popups should not clean toggle keys.
+test_name="open_nested_with_toggle_key"
+exit_codes=(0 0 0)
+t_toggle_mode="force-open"
+t_opened_name="p_nested_toggle_key_1"
+begin_test "$test_name"
+test_toggle --name="p_nested_toggle_key_2" --toggle-key="-n M-o"

src/toggle_tests/open_nested_with_toggle_key.stdout

@@ -0,0 +1,25 @@
+>>>TMUX:BEGIN(1)
+display
+before-open
+;
+run
+#{@before_open}
+<<<TMUX:END(1)
+
+>>>TMUX:BEGIN(2)
+set
+default-shell
+/bin/sh
+;
+popup
+tmux set default-shell '/usr/bin/fish'; export TMUX_POPUP_SERVER='popup_server2' SHELL='/usr/bin/fish'; exec tmux -S socket/path/popup_server2 new -As pane/path/p_nested_toggle_key_2 \; set @__popup_name p_nested_toggle_key_2 \; set @__popup_id_format pane/path/\{popup_name\} \; set @__popup_caller_path working/session/path \; set @__popup_caller_pane_path working/pane/path \; bind -n M-o run \#\{@popup-toggle\}\ --name=p_nested_toggle_key_2\ --toggle-key=-n\\\ M-o\  \; display on-init \; run \#\{@on_init\}  >/dev/null
+<<<TMUX:END(2)
+
+>>>TMUX:BEGIN(3)
+display
+after-close
+;
+run
+#{@after_close}
+<<<TMUX:END(3)
+

src/toggle_tests/open_with_toggle_key.stdout

@@ -0,0 +1,40 @@
+>>>TMUX:BEGIN(1)
+display
+before-open
+;
+run
+#{@before_open}
+<<<TMUX:END(1)
+
+>>>TMUX:BEGIN(2)
+set
+default-shell
+/bin/sh
+;
+popup
+tmux set default-shell '/usr/bin/fish'; export TMUX_POPUP_SERVER='popup_server2' SHELL='/usr/bin/fish'; exec tmux -S socket/path/popup_server2 new -As pane/path/p_toggle_key \; set @__popup_name p_toggle_key \; set @__popup_id_format pane/path/\{popup_name\} \; set @__popup_caller_path working/session/path \; set @__popup_caller_pane_path working/pane/path \; bind -T root M-p run \#\{@popup-toggle\}\ --name=p_toggle_key\ --toggle-key=-T\\\ root\\\ M-p\ --toggle-key=-n\\\ M-o\  \; bind -n M-o run \#\{@popup-toggle\}\ --name=p_toggle_key\ --toggle-key=-T\\\ root\\\ M-p\ --toggle-key=-n\\\ M-o\  \; display on-init \; run \#\{@on_init\}  >/dev/null
+<<<TMUX:END(2)
+
+>>>TMUX:BEGIN(3)
+-N
+-S
+socket/path/popup_server2
+unbind
+-T
+root
+M-p
+;
+unbind
+-n
+M-o
+;
+<<<TMUX:END(3)
+
+>>>TMUX:BEGIN(4)
+display
+after-close
+;
+run
+#{@after_close}
+<<<TMUX:END(4)
+