kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-01-01 17:23:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16914 from godlygeek/fix_14587

Browse Source 
fix(screen): don't put empty sign text in line number column
This commit is contained in:
Christian Clason 2022-02-13 11:41:17 +01:00 committed by GitHub
commit 1b73ae653f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/screen.c
View File

@ -2813,7 +2813,7 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool noc
// in 'lnum', then display the sign instead of the line
// number.
if (*wp->w_p_scl == 'n' && *(wp->w_p_scl + 1) == 'u'
&& num_signs > 0) {
&& num_signs > 0 && sign_get_attr(SIGN_TEXT, sattrs, 0, 1)) {
int count = win_signcol_count(wp);
get_sign_display_info(true, wp, lnum, sattrs, row,
startrow, filler_lines, filler_todo, count,

26
test/functional/ui/sign_spec.lua
View File

@ -526,6 +526,32 @@ describe('Signs', function()
]])
end)
it('shows the line number when signcolumn=number but no marks on a line have text', function()
feed('ia<cr>b<cr>c<cr><esc>')
command('set number signcolumn=number')
command('sign define pietSearch text=>> texthl=Search numhl=Error')
command('sign define pietError text= texthl=Search numhl=Error')
command('sign place 1 line=1 name=pietSearch buffer=1')
command('sign place 2 line=2 name=pietError buffer=1')
-- no signcolumn, line number for "a" is Search, for "b" is Error, for "c" is LineNr
screen:expect([[
{1: >> }a |
{8: 2 }b |
{6: 3 }c |
{6: 4 }^ |
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
|
]])
end)
it('can have 32bit sign IDs', function()
command('sign define piet text=>> texthl=Search')
command('sign place 100000 line=1 name=piet buffer=1')