wyj/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-09-17 20:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(winbar): allow winbar to display the ruler

Browse Source
This commit is contained in:
bfredl 2022-05-20 00:15:47 +02:00
parent 3fe6bf3a1e
commit 060ef52d8b
3 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.mailmap
View File

@ -8,7 +8,7 @@ Anmol Sethi <hi@nhooyr.io> <nhooyr@users.noreply.github.com>
BK1603 <chouhan.shreyansh2702@gmail.com> Shreyansh Chouhan
Billy Su <g4691821@gmail.com> Billy SU
Billy Vong <billyvg@gmail.com> <billyvg@users.noreply.github.com>
Björn Linse <bjorn.linse@gmail.com> bfredl
bfredl <bjorn.linse@gmail.com>
Carlos Hernandez <carlos@techbyte.ca> <hurricanehrndz@users.noreply.github.com>
Chris Kipp <ckipp@pm.me> ckipp01
Christian Clason <c.clason@uni-graz.at> <christian.clason@uni-due.de>

3
src/nvim/screen.c
View File

@ -6463,6 +6463,9 @@ void showruler(bool always)
} else {
win_redr_ruler(curwin, always);
}
if (*p_wbr != NUL || *curwin->w_p_wbr != NUL) {
win_redr_winbar(curwin);
}
if (need_maketitle
|| (p_icon && (stl_syntax & STL_IN_ICON))

54
test/functional/ui/winbar_spec.lua
View File

@ -6,6 +6,7 @@ local insert = helpers.insert
local meths = helpers.meths
local eq = helpers.eq
local poke_eventloop = helpers.poke_eventloop
local feed = helpers.feed
describe('winbar', function()
local screen
@ -148,6 +149,59 @@ describe('winbar', function()
|
]])
end)
it('can be ruler', function()
insert [[
just some
random text]]
meths.set_option('winbar', 'Hello, I am a ruler: %l,%c')
screen:expect{grid=[[
{1:Hello, I am a ruler: 2,11 }|
just some |
random tex^t |
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
|
]]}
feed 'b'
screen:expect{grid=[[
{1:Hello, I am a ruler: 2,8 }|
just some |
random ^text |
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
|
]]}
feed 'k'
screen:expect{grid=[[
{1:Hello, I am a ruler: 1,8 }|
just so^me |
random text |
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
|
]]}
end)
it('works with laststatus=3', function()
command('set laststatus=3')
screen:expect([[