From 8844ee60bbeafe1ccf89a83370121f33f26bcb18 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sat, 16 Aug 2025 16:44:10 -0400 Subject: Fix bug with assuming first pane is at index 1 --- tests.sh | 22 +++++++++++++--------- toggle-term.sh | 9 +++++++-- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/tests.sh b/tests.sh index 19f55d9..ed883e3 100644 --- a/tests.sh +++ b/tests.sh @@ -5,6 +5,7 @@ load 'vendor/bats-assert/load' setup() { export TMUX_SOCKET="test$$" + export TMUX_CONFIG_PATH="$TMUX_CONFIG_PATH" export TEST_SESSION="test-$BATS_TEST_NUMBER-$$" tmux_start_server } @@ -14,25 +15,25 @@ teardown() { } tmux_start_server() { - tmux -L "$TMUX_SOCKET" new-session -d -s "$TEST_SESSION" 'sleep 1000' + tmux -f "$TMUX_CONFIG_PATH" -L "$TMUX_SOCKET" new-session -d -s "$TEST_SESSION" 'sleep 1000' } tmux_kill_server() { - tmux -L "$TMUX_SOCKET" kill-server || true + tmux -f "$TMUX_CONFIG_PATH" -L "$TMUX_SOCKET" kill-server || true } tmux_pane_count() { - num_panes=$(tmux -L "$TMUX_SOCKET" list-panes | wc -l | sed 's/^[[:space:]]*//g') + num_panes=$(tmux -f "$TMUX_CONFIG_PATH" -L "$TMUX_SOCKET" list-panes | wc -l | sed 's/^[[:space:]]*//g') echo "$num_panes" } tmux_active_panes() { - active_panes=$(tmux -L "$TMUX_SOCKET" list-panes -F '#{pane_active}' | tr '\n' '-' | sed 's/-$//g') + active_panes=$(tmux -f "$TMUX_CONFIG_PATH" -L "$TMUX_SOCKET" list-panes -F '#{pane_active}' | tr '\n' '-' | sed 's/-$//g') echo "$active_panes" } tmux_is_zoomed() { - is_zoomed=$(tmux -L "$TMUX_SOCKET" list-panes -F '#{window_zoomed_flag}') + is_zoomed=$(tmux -f "$TMUX_CONFIG_PATH" -L "$TMUX_SOCKET" list-panes -F '#{window_zoomed_flag}') if echo "$is_zoomed" | grep -q 1; then echo 'true' else @@ -44,7 +45,8 @@ tmux_is_zoomed() { assert_equal "$(tmux_pane_count)" 1 assert_equal "$(tmux_active_panes)" '1' - ./toggle-term.sh split + run ./toggle-term.sh split + assert_success assert_equal "$(tmux_pane_count)" 2 assert_equal "$(tmux_active_panes)" '0-1' @@ -54,10 +56,12 @@ tmux_is_zoomed() { assert_equal "$(tmux_pane_count)" 1 assert_equal "$(tmux_active_panes)" '1' - ./toggle-term.sh split - ./toggle-term.sh split + run ./toggle-term.sh split + assert_success + run ./toggle-term.sh split + assert_success assert_equal "$(tmux_pane_count)" 2 - # assert_equal "$(tmux_active_panes)" '1-0' + assert_equal "$(tmux_active_panes)" '1-0' assert_equal "$(tmux_is_zoomed)" 'true' } diff --git a/toggle-term.sh b/toggle-term.sh index ace5978..d19fd70 100755 --- a/toggle-term.sh +++ b/toggle-term.sh @@ -8,7 +8,11 @@ POPUP_SESSION_NAME="popup" main() { if [ -n "${TMUX_SOCKET:-}" ]; then - TMUX_CMD="tmux -L $TMUX_SOCKET" + if [ -n "${TMUX_CONFIG_PATH:-}" ]; then + TMUX_CMD="tmux -f $TMUX_CONFIG_PATH -L $TMUX_SOCKET" + else + TMUX_CMD="tmux -L $TMUX_SOCKET" + fi fi mode="$1" @@ -89,7 +93,8 @@ toggle_split() { # # To simulate 'toggling' between the main pane and the split # pane, we 'zoom' the main pane so it takes up the full screen. - $TMUX_CMD resize-pane -Z -t1 + first_pane_index="$($TMUX_CMD list-panes -F '#{pane_index}' | head -n1)" + $TMUX_CMD resize-pane -Z -t"$first_pane_index" } main "$@" -- cgit v1.2.3