IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

shadow previously set signs #1893

Browse Source
This commit is contained in:
Felipe Morales 2015-01-27 00:56:03 -03:00 committed by Justin M. Keyes
parent 2d22e1f035
commit 6e992876ea
2 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/buffer.c
View File

@ -4337,10 +4337,8 @@ void buf_addsign(
if (lnum == sign->lnum && id == sign->id) {
sign->typenr = typenr;
return;
}
else if (id < 0 /* keep signs sorted by lnum */
&& lnum < sign->lnum)
{
} else if ((lnum == sign->lnum && id != sign->id)
|| (id < 0 && lnum < sign->lnum)) { // attempt to keep signs sorted by lnum
insert_sign(buf, prev, sign, id, lnum, typenr);
return;
}

45
test/functional/ui/sign_spec.lua Normal file
View File

@ -0,0 +1,45 @@
local helpers = require('test.functional.helpers')
local Screen = require('test.functional.ui.screen')
local clear, feed, execute = helpers.clear, helpers.feed, helpers.execute
describe('Signs', function()
local screen
before_each(function()
clear()
screen = Screen.new()
screen:attach()
screen:set_default_attr_ignore( {{}, {bold=true, foreground=255}} )
end)
after_each(function()
screen:detach()
end)
describe(':sign place', function()
it('shadows previously placed signs', function()
feed('ia<cr>b<cr>c<cr><esc>')
execute('sign define piet text=>> texthl=Search')
execute('sign define pietx text=>! texthl=Search')
execute('sign place 1 line=1 name=piet buffer=1')
execute('sign place 2 line=3 name=piet buffer=1')
execute('sign place 3 line=1 name=pietx buffer=1')
screen:expect([[
>!a |
b |
>>c |
^ |
~ |
~ |
~ |
~ |
~ |
~ |
~ |
~ |
~ |
:sign place 3 line=1 name=pietx buffer=1 |
]])
end)
end)
end)