diff options
| -rw-r--r-- | src/nvim/winfloat.c | 7 | ||||
| -rw-r--r-- | test/functional/ui/float_spec.lua | 29 |
2 files changed, 36 insertions, 0 deletions
diff --git a/src/nvim/winfloat.c b/src/nvim/winfloat.c index d11b965dfc..8b039ffa79 100644 --- a/src/nvim/winfloat.c +++ b/src/nvim/winfloat.c @@ -22,6 +22,7 @@ #include "nvim/move.h" #include "nvim/option.h" #include "nvim/option_defs.h" +#include "nvim/option_vars.h" #include "nvim/optionstr.h" #include "nvim/pos_defs.h" #include "nvim/strings.h" @@ -65,6 +66,12 @@ win_T *win_new_float(win_T *wp, bool last, WinConfig fconfig, Error *err) } wp = win_alloc(tp_last, false); win_init(wp, curwin, 0); + if (wp->w_p_wbr != NULL && fconfig.height == 1) { + if (wp->w_p_wbr != empty_string_option) { + free_string_option(wp->w_p_wbr); + } + wp->w_p_wbr = empty_string_option; + } } else { assert(!last); assert(!wp->w_floating); diff --git a/test/functional/ui/float_spec.lua b/test/functional/ui/float_spec.lua index 15231e0f8c..088692c055 100644 --- a/test/functional/ui/float_spec.lua +++ b/test/functional/ui/float_spec.lua @@ -9845,6 +9845,35 @@ describe('float window', function() }) end end) + + it("1-line float does not inherit 'winbar' #19464", function() + local res = exec_lua([[ + local win = vim.api.nvim_get_current_win() + vim.wo[win].winbar = '%f' + local grp = vim.api.nvim_create_augroup('asdf', { clear = true }) + vim.api.nvim_create_autocmd('WinEnter', { + group = grp, + pattern = '*', + desc = 'winbar crash?', + callback = function() + vim.wo[win].winbar = '%f' + end, + }) + + local buf = vim.api.nvim_create_buf(false, true) + local float_winid = vim.api.nvim_open_win(buf, true, { + relative = 'win', + win = win, + border = 'single', + col = 1, + row = 1, + height = 1, + width = 40, + }) + return {vim.wo[win].winbar, vim.wo[float_winid].winbar} + ]]) + eq({"%f", ""}, res) + end) end describe('with ext_multigrid', function() |