neovim

commit 431004dda2bbfe1565afcaa5117a0287317b0215
parent 79bfeecdb483c683e79abca3e9a1bd98b3a30b0f
Author: Evgeni Chasnovski <evgeni.chasnovski@gmail.com>
Date:   Tue,  2 Sep 2025 21:21:19 +0300

fix: screenchar()/screenstring() with hidden floating windows #35560


Diffstat:
M
src/nvim/ui_compositor.c
 | 
3
++-
M
test/functional/vimscript/screenchar_spec.lua
 | 
32
++++++++++++++++++++++++++++++++

2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/src/nvim/ui_compositor.c b/src/nvim/ui_compositor.c
@@ -335,7 +335,8 @@ ScreenGrid *ui_comp_get_grid_at_coord(int row, int col)
   FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
     ScreenGrid *grid = &wp->w_grid_alloc;
     if (row >= grid->comp_row && row < grid->comp_row + grid->rows
-        && col >= grid->comp_col && col < grid->comp_col + grid->cols) {
+        && col >= grid->comp_col && col < grid->comp_col + grid->cols
+        && !wp->w_config.hide) {
       return grid;
     }
   }
diff --git a/test/functional/vimscript/screenchar_spec.lua b/test/functional/vimscript/screenchar_spec.lua
@@ -76,7 +76,39 @@ describe('screenchar() and family respect floating windows', function()
   describe('with ext_multigrid', function()
     with_ext_multigrid(true)
   end)
+
   describe('without ext_multigrid', function()
     with_ext_multigrid(false)
   end)
+
+  describe('hidden windows', function()
+    before_each(function()
+      clear()
+      Screen.new(40, 7, {})
+      api.nvim_buf_set_lines(0, 0, -1, true, { 'aaa', 'aaa' })
+    end)
+
+    local assert_screen_funcs = function()
+      eq('a', fn.screenstring(1, 1))
+      eq(97, fn.screenchar(1, 1))
+      eq({ 97 }, fn.screenchars(1, 1))
+      eq(fn.screenattr(2, 1), fn.screenattr(1, 1))
+    end
+
+    it('manual', function()
+      local bufnr = api.nvim_create_buf(false, true)
+      api.nvim_buf_set_lines(bufnr, 0, -1, true, { 'bb' })
+      local win_opts = { relative = 'editor', row = 0, col = 0, height = 1, width = 2, hide = true }
+      api.nvim_open_win(bufnr, false, win_opts)
+
+      assert_screen_funcs()
+    end)
+
+    it('from ui2', function()
+      n.exec_lua('require("vim._extui").enable({ enable = true })')
+      command('echo "foo"')
+
+      assert_screen_funcs()
+    end)
+  end)
 end)