GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-22 06:12:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(float): can set title/footer without setting border #32594

Browse Source 
Problem: setting title and/or footer without explicitly setting border
  shows "title/footer/ requires border to be set" error.
  At the same time, explicitly setting `border = "none"` (which is
  default) shows expected no-border-no-title-no-footer window without
  error.

Solution: allow setting title/footer without explicitly setting border.
This commit is contained in:
Evgeni Chasnovski
2025-02-23 19:08:16 +02:00
committed by GitHub
parent 6bc7979044
commit 07c5f41da3
2 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/api/win_config.c
View File

@ -1240,11 +1240,6 @@ static bool parse_win_config(win_T *wp, Dict(win_config) *config, WinConfig *fco
api_set_error(err, kErrorTypeValidation, "non-float cannot have 'title'"); api_set_error(err, kErrorTypeValidation, "non-float cannot have 'title'");
goto fail; goto fail;
} }
// title only work with border
if (!HAS_KEY_X(config, border) && !fconfig->border) {
api_set_error(err, kErrorTypeException, "title requires border to be set");
goto fail;
}
parse_bordertext(config->title, kBorderTextTitle, fconfig, err); parse_bordertext(config->title, kBorderTextTitle, fconfig, err);
if (ERROR_SET(err)) { if (ERROR_SET(err)) {
@ -1267,11 +1262,6 @@ static bool parse_win_config(win_T *wp, Dict(win_config) *config, WinConfig *fco
api_set_error(err, kErrorTypeValidation, "non-float cannot have 'footer'"); api_set_error(err, kErrorTypeValidation, "non-float cannot have 'footer'");
goto fail; goto fail;
} }
// footer only work with border
if (!HAS_KEY_X(config, border) && !fconfig->border) {
api_set_error(err, kErrorTypeException, "footer requires border to be set");
goto fail;
}
parse_bordertext(config->footer, kBorderTextFooter, fconfig, err); parse_bordertext(config->footer, kBorderTextFooter, fconfig, err);
if (ERROR_SET(err)) { if (ERROR_SET(err)) {

51
test/functional/ui/float_spec.lua
View File

@ -2078,10 +2078,6 @@ describe('float window', function()
it('validates title title_pos', function() it('validates title title_pos', function()
local buf = api.nvim_create_buf(false,false) local buf = api.nvim_create_buf(false,false)
eq("title requires border to be set",
pcall_err(api.nvim_open_win,buf, false, {
relative='editor', width=9, height=2, row=2, col=5, title='Title',
}))
eq("title_pos requires title to be set", eq("title_pos requires title to be set",
pcall_err(api.nvim_open_win,buf, false, { pcall_err(api.nvim_open_win,buf, false, {
relative='editor', width=9, height=2, row=2, col=5, relative='editor', width=9, height=2, row=2, col=5,
@ -2112,10 +2108,6 @@ describe('float window', function()
it('validates footer footer_pos', function() it('validates footer footer_pos', function()
local buf = api.nvim_create_buf(false,false) local buf = api.nvim_create_buf(false,false)
eq("footer requires border to be set",
pcall_err(api.nvim_open_win,buf, false, {
relative='editor', width=9, height=2, row=2, col=5, footer='Footer',
}))
eq("footer_pos requires footer to be set", eq("footer_pos requires footer to be set",
pcall_err(api.nvim_open_win,buf, false, { pcall_err(api.nvim_open_win,buf, false, {
relative='editor', width=9, height=2, row=2, col=5, relative='editor', width=9, height=2, row=2, col=5,
@ -2190,6 +2182,49 @@ describe('float window', function()
assert_alive() assert_alive()
end) end)
it('no border with title and footer', function()
local buf = api.nvim_create_buf(false, false)
api.nvim_buf_set_lines(buf, 0, -1, true, { 'Hello' })
api.nvim_open_win(buf, false, {
relative='editor', width=9, height=2, row=2, col=5,
title = 'Title', footer = 'Footer'
})
if multigrid then
screen:expect({
grid = [[
## grid 1
[2:----------------------------------------]|*6
[3:----------------------------------------]|
## grid 2
^ |
{0:~ }|*5
## grid 3
|
## grid 4
{1:Hello }|
{2:~ }|
]],
float_pos = {
[4] = { 1001, "NW", 1, 2, 5, true, 50 },
},
win_viewport = {
[2] = { win = 1000, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0 },
[4] = { win = 1001, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0 },
},
})
else
screen:expect([[
^ |
{0:~ }|
{0:~ }{1:Hello }{0: }|
{0:~ }{2:~ }{0: }|
{0:~ }|*2
|
]])
end
end)
it('border with title', function() it('border with title', function()
local buf = api.nvim_create_buf(false, false) local buf = api.nvim_create_buf(false, false)
api.nvim_buf_set_lines(buf, 0, -1, true, {' halloj! ', api.nvim_buf_set_lines(buf, 0, -1, true, {' halloj! ',