neovim

commit 6f632a8615e03847b05051f0783a768b81a30c3e
parent 811e12cebcb2d5ea534912d0bda7d52863281efa
Author: luukvbaal <luukvbaal@gmail.com>
Date:   Mon,  9 Jun 2025 14:43:33 +0200

fix(compositor): don't blend uninitialized background cells #34364

Problem:  A 'winblend' window floating over uninitialized cells loses
          its highlighting.

Solution: Return the front attribute for uninitialized background cells.
Diffstat:
M
src/nvim/highlight.c
 | 
3
++-
M
test/functional/terminal/tui_spec.lua
 | 
23
+++++++++++++++++++++++

2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/src/nvim/highlight.c b/src/nvim/highlight.c
@@ -699,8 +699,9 @@ static HlAttrs get_colors_force(int attr)
 /// @return the resulting attributes.
 int hl_blend_attrs(int back_attr, int front_attr, bool *through)
 {
+  // Cannot blend uninitialized cells, use front_attr for uninitialized background cells.
   if (front_attr < 0 || back_attr < 0) {
-    return -1;
+    return front_attr;
   }
 
   HlAttrs fattrs = get_colors_force(front_attr);
diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua
@@ -2521,6 +2521,29 @@ describe('TUI', function()
     }
   end)
 
+  it("float is still highlighted with 'winblend' over uninitialized cells #34360", function()
+    write_file(
+      'Xblend.lua',
+      [[
+        local win = vim.api.nvim_open_win(0, false, { relative = 'editor', width = 3, height = 1, row = 1000, col = 0, zindex = 400 })
+        vim.api.nvim_set_option_value('winblend', 30, { win = win })
+        vim.fn.setline(1, "foo")
+        vim.api.nvim_buf_set_extmark(0, vim.api.nvim_create_namespace(''), 0, 0, { end_col = 3, hl_group = 'Title' })
+    ]]
+    )
+    finally(function()
+      os.remove('Xblend.lua')
+    end)
+    local screen = tt.setup_child_nvim({ '--clean', '-u', 'Xblend.lua' })
+    screen:expect([[
+      {3:^foo}                                               |
+      ~                                                 |*3
+      [No Name] [+]                   1,1            All|
+      {3:foo}                                               |
+      {3:-- TERMINAL --}                                    |
+    ]])
+  end)
+
   it('with non-tty (pipe) stdout/stderr', function()
     finally(function()
       os.remove('testF')