Merge branch 'main' into readme

Author: aserowy

lua/tmux/navigation/navigate.lua

@@ -29,7 +29,7 @@ function M.to(direction)
     log.debug("navigate_to: " .. direction)
 
     local is_nvim_border = nvim.is_nvim_border(direction)
-    if is_nvim_border and M.has_tmux_target(direction) then
+    if (nvim.is_nvim_float() or is_nvim_border) and M.has_tmux_target(direction) then
         tmux.change_pane(direction)
     elseif is_nvim_border and options.navigation.cycle_navigation then
         nvim.wincmd(opposite_directions[direction], 999)

lua/tmux/resize.lua

@@ -38,7 +38,7 @@ end
 function M.to_left(step)
     step = step or options.resize.resize_step_x
     local is_border = nvim.is_nvim_border("l")
-    if is_border and is_tmux_target("l") then
+    if (nvim.is_nvim_float() or is_border) and is_tmux_target("l") then
         tmux.resize("h", step)
     elseif is_border then
         nvim.resize("x", "+", step)
@@ -50,7 +50,7 @@ end
 function M.to_bottom(step)
     step = step or options.resize.resize_step_y
     local is_border = nvim.is_nvim_border("j")
-    if is_border and is_tmux_target("j") then
+    if (nvim.is_nvim_float() or is_border) and is_tmux_target("j") then
         tmux.resize("j", step)
     elseif is_border then
         nvim.resize("y", "-", step)
@@ -62,7 +62,7 @@ end
 function M.to_top(step)
     step = step or options.resize.resize_step_y
     local is_border = nvim.is_nvim_border("j")
-    if is_border and is_tmux_target("j") then
+    if (nvim.is_nvim_float() or is_border) and is_tmux_target("j") then
         tmux.resize("k", step)
     elseif is_border then
         nvim.resize("y", "+", step)
@@ -74,7 +74,7 @@ end
 function M.to_right(step)
     step = step or options.resize.resize_step_x
     local is_border = nvim.is_nvim_border("l")
-    if is_border and is_tmux_target("l") then
+    if (nvim.is_nvim_float() or is_border) and is_tmux_target("l") then
         tmux.resize("l", step)
     elseif is_border then
         nvim.resize("x", "-", step)

lua/tmux/wrapper/nvim.lua

@@ -3,6 +3,10 @@ function M.is_nvim_border(border)
     return M.winnr() == M.winnr("1" .. border)
 end
 
+function M.is_nvim_float()
+    return vim.api.nvim_win_get_config(0).relative ~= ""
+end
+
 function M.resize(axis, direction, step_size)
     local command = "resize "
     if axis == "x" then

spec/tmux/navigation/navigate_spec.lua

@@ -168,6 +168,9 @@ describe("navigate.to", function()
         nvim.is_nvim_border = function()
             return false
         end
+        nvim.is_nvim_float = function()
+            return false
+        end
 
         local last_called_direction = ""
         nvim.wincmd = function(direction)
@@ -195,6 +198,9 @@ describe("navigate.to", function()
         nvim.is_nvim_border = function()
             return true
         end
+        nvim.is_nvim_float = function()
+            return false
+        end
 
         local last_called_direction = ""
         nvim.wincmd = function(direction)
@@ -222,6 +228,9 @@ describe("navigate.to", function()
         nvim.is_nvim_border = function()
             return true
         end
+        nvim.is_nvim_float = function()
+            return false
+        end
 
         local last_called_direction = ""
         nvim.wincmd = function(direction, count)
@@ -250,6 +259,39 @@ describe("navigate.to", function()
         nvim.is_nvim_border = function()
             return true
         end
+        nvim.is_nvim_float = function()
+            return false
+        end
+
+        local last_called_direction = ""
+        tmux.change_pane = function(direction)
+            last_called_direction = direction
+        end
+
+        navigate.to("h")
+        assert.are.same("h", last_called_direction)
+
+        navigate.to("j")
+        assert.are.same("j", last_called_direction)
+
+        navigate.to("k")
+        assert.are.same("k", last_called_direction)
+
+        navigate.to("l")
+        assert.are.same("l", last_called_direction)
+    end)
+
+    it("check with nvim float win", function()
+        options.navigation.cycle_navigation = true
+        navigate.has_tmux_target = function()
+            return true
+        end
+        nvim.is_nvim_border = function()
+            return false
+        end
+        nvim.is_nvim_float = function()
+            return true
+        end
 
         local last_called_direction = ""
         tmux.change_pane = function(direction)