From a3350b3287daf69f7e2cdbcbf0a8b9ec149837de Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 10 Sep 2026 20:53:04 +0000 Subject: [PATCH 1/2] Initial plan From 22119dc5715f09bdddf93957e32c75e069b120b3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 10 Sep 2026 20:56:05 +0000 Subject: [PATCH 2/2] fix: use NormalFloat in keymap help window Co-authored-by: esmuellert <41042490+esmuellert@users.noreply.github.com> --- lua/codediff/ui/keymap_help.lua | 2 +- tests/keymap/keymap_help_spec.lua | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lua/codediff/ui/keymap_help.lua b/lua/codediff/ui/keymap_help.lua index c6f29eab..c9cbf978 100644 --- a/lua/codediff/ui/keymap_help.lua +++ b/lua/codediff/ui/keymap_help.lua @@ -337,7 +337,7 @@ function M.toggle(tabpage) title_pos = "center", }) vim.wo[win].cursorline = false - vim.wo[win].winhighlight = "NormalFloat:Normal" + vim.wo[win].winhighlight = "NormalFloat:NormalFloat" -- Track window in session for toggle if session then diff --git a/tests/keymap/keymap_help_spec.lua b/tests/keymap/keymap_help_spec.lua index 3afda4c4..25140162 100644 --- a/tests/keymap/keymap_help_spec.lua +++ b/tests/keymap/keymap_help_spec.lua @@ -258,6 +258,19 @@ describe("keymap help popup", function() cleanup() end) + it("uses NormalFloat for the help window body highlight", function() + local tabpage, cleanup = open_standalone() + + keymap_help.toggle(tabpage) + local session = lifecycle.get_session(tabpage) + local win = session and session._help_win + assert.is_true(win ~= nil and vim.api.nvim_win_is_valid(win), "help window should open") + assert.are.same("NormalFloat:NormalFloat", vim.wo[win].winhighlight) + keymap_help.toggle(tabpage) + + cleanup() + end) + it("does not advertise a key disabled in config", function() local tabpage, cleanup = open_standalone({ keymaps = { view = { quit = false, toggle_compact = false } } })