Fix highlighting when swapping windows on error (#20)

MisanthropicBit · Nov 20, 2024 · 5f06812 · 5f06812
1 parent 6b66a94
commit 5f06812
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/lua/winmove/swap.lua b/lua/winmove/swap.lua
@@ -43,10 +43,12 @@ function swap.swap_window(win_id)
     end
 
     if not vim.api.nvim_win_is_valid(selected_window) then
+        highlight.unhighlight_window(selected_window)
         selected_window = nil
         message.error("Previously selected window is not valid anymore")
         return
     elseif win_id == selected_window then
+        highlight.unhighlight_window(selected_window)
         selected_window = nil
         message.error("Cannot swap selected window with itself")
         return

diff --git a/tests/swap_window_spec.lua b/tests/swap_window_spec.lua
@@ -201,6 +201,7 @@ describe("swap window", function()
                 .called_with("[winmove.nvim]: Cannot swap selected window with itself", vim.log.levels.ERROR)
 
             assert.matches_winlayout(vim.fn.winlayout(), { "leaf", main_win_id })
+            assert.are.same(vim.wo[main_win_id].winhighlight, "")
 
             ---@diagnostic disable-next-line: undefined-field
             vim.notify:revert()