aboutsummaryrefslogtreecommitdiff
path: root/test/functional/ui/sign_spec.lua
diff options
context:
space:
mode:
Diffstat (limited to 'test/functional/ui/sign_spec.lua')
-rw-r--r--test/functional/ui/sign_spec.lua652
1 files changed, 252 insertions, 400 deletions
diff --git a/test/functional/ui/sign_spec.lua b/test/functional/ui/sign_spec.lua
index b12e79bd42..847a918dc9 100644
--- a/test/functional/ui/sign_spec.lua
+++ b/test/functional/ui/sign_spec.lua
@@ -1,8 +1,7 @@
local helpers = require('test.functional.helpers')(after_each)
local Screen = require('test.functional.ui.screen')
-local clear, feed, command = helpers.clear, helpers.feed, helpers.command
-local source = helpers.source
-local meths = helpers.meths
+local api, clear, eq = helpers.api, helpers.clear, helpers.eq
+local eval, exec, feed = helpers.eval, helpers.exec, helpers.feed
describe('Signs', function()
local screen
@@ -11,90 +10,68 @@ describe('Signs', function()
clear()
screen = Screen.new()
screen:attach()
- screen:set_default_attr_ids( {
- [0] = {bold=true, foreground=255},
- [1] = {background = Screen.colors.Yellow},
- [2] = {foreground = Screen.colors.DarkBlue, background = Screen.colors.Grey},
- [3] = {background = Screen.colors.Gray90},
- [4] = {bold = true, reverse = true},
- [5] = {reverse = true},
- [6] = {foreground = Screen.colors.Brown},
- [7] = {foreground = Screen.colors.DarkBlue, background = Screen.colors.LightGrey},
- [8] = {foreground = Screen.colors.Grey100, background = Screen.colors.Red},
- [9] = {bold = true, foreground = Screen.colors.Magenta},
- [10] = {foreground = Screen.colors.Blue1},
- [11] = {bold = true, foreground = Screen.colors.SeaGreen4},
- } )
+ screen:set_default_attr_ids({
+ [0] = { bold = true, foreground = 255 },
+ [1] = { background = Screen.colors.Yellow },
+ [2] = { foreground = Screen.colors.DarkBlue, background = Screen.colors.Grey },
+ [3] = { background = Screen.colors.Gray90 },
+ [4] = { bold = true, reverse = true },
+ [5] = { reverse = true },
+ [6] = { foreground = Screen.colors.Brown },
+ [7] = { foreground = Screen.colors.DarkBlue, background = Screen.colors.LightGrey },
+ [8] = { foreground = Screen.colors.Grey100, background = Screen.colors.Red },
+ [9] = { bold = true, foreground = Screen.colors.Magenta },
+ [10] = { foreground = Screen.colors.Blue1 },
+ [11] = { bold = true, foreground = Screen.colors.SeaGreen4 },
+ })
end)
describe(':sign place', function()
it('allows signs with combining characters', function()
feed('ia<cr>b<cr><esc>')
- command('sign define piet1 text=𐌢̀́̂̃̅̄𐌢̀́̂̃̅̄ texthl=Search')
- command('sign define piet2 text=𠜎̀́̂̃̄̅ texthl=Search')
- command('sign place 1 line=1 name=piet1 buffer=1')
- command('sign place 2 line=2 name=piet2 buffer=1')
+ exec([[
+ sign define piet1 text=𐌢̀́̂̃̅̄𐌢̀́̂̃̅̄ texthl=Search
+ sign define piet2 text=𠜎̀́̂̃̄̅ texthl=Search
+ sign place 1 line=1 name=piet1 buffer=1
+ sign place 2 line=2 name=piet2 buffer=1
+ ]])
screen:expect([[
{1:𐌢̀́̂̃̅̄𐌢̀́̂̃̅̄}a |
{1:𠜎̀́̂̃̄̅}b |
{2: }^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*10
|
]])
end)
it('shadows previously placed signs', function()
feed('ia<cr>b<cr>c<cr><esc>')
- command('sign define piet text=>> texthl=Search')
- command('sign define pietx text=>! texthl=Search')
- command('sign place 1 line=1 name=piet buffer=1')
- command('sign place 2 line=3 name=piet buffer=1')
- command('sign place 3 line=1 name=pietx buffer=1')
+ exec([[
+ sign define piet text=>> texthl=Search
+ sign define pietx text=>! texthl=Search
+ sign place 1 line=1 name=piet buffer=1
+ sign place 2 line=3 name=piet buffer=1
+ sign place 3 line=1 name=pietx buffer=1
+ ]])
screen:expect([[
{1:>!}a |
{2: }b |
{1:>>}c |
{2: }^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*9
|
]])
end)
it('allows signs with no text', function()
feed('ia<cr>b<cr><esc>')
- command('sign define piet1 text= texthl=Search')
- command('sign place 1 line=1 name=piet1 buffer=1')
+ exec('sign define piet1 text= texthl=Search')
+ exec('sign place 1 line=1 name=piet1 buffer=1')
screen:expect([[
a |
b |
^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*10
|
]])
end)
@@ -104,7 +81,7 @@ describe('Signs', function()
-- This used to cause a crash due to :sign using a special redraw
-- (not updating nvim's specific highlight data structures)
-- without proper redraw first, as split just flags for redraw later.
- source([[
+ exec([[
set cursorline
sign define piet text=>> texthl=Search
split
@@ -115,8 +92,7 @@ describe('Signs', function()
{1:>>}b |
{2: }c |
{2: } |
- {0:~ }|
- {0:~ }|
+ {0:~ }|*2
{4:[No Name] [+] }|
{2: }{3:a }|
{1:>>}b |
@@ -130,58 +106,45 @@ describe('Signs', function()
it('can combine text, linehl and numhl', function()
feed('ia<cr>b<cr>c<cr><esc>')
- command('set number')
- command('sign define piet text=>> texthl=Search')
- command('sign define pietx linehl=ErrorMsg')
- command('sign define pietxx numhl=Folded')
- command('sign place 1 line=1 name=piet buffer=1')
- command('sign place 2 line=2 name=pietx buffer=1')
- command('sign place 3 line=3 name=pietxx buffer=1')
- command('sign place 4 line=4 name=piet buffer=1')
- command('sign place 5 line=4 name=pietx buffer=1')
- command('sign place 6 line=4 name=pietxx buffer=1')
+ exec([[
+ set number
+ sign define piet text=>> texthl=Search
+ sign define pietx linehl=ErrorMsg
+ sign define pietxx numhl=Folded
+ sign place 1 line=1 name=piet buffer=1
+ sign place 2 line=2 name=pietx buffer=1
+ sign place 3 line=3 name=pietxx buffer=1
+ sign place 4 line=4 name=piet buffer=1
+ sign place 5 line=4 name=pietx buffer=1
+ sign place 6 line=4 name=pietxx buffer=1
+ ]])
screen:expect([[
{1:>>}{6: 1 }a |
{2: }{6: 2 }{8:b }|
{2: }{7: 3 }c |
{1:>>}{7: 4 }{8:^ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*9
|
]])
-- Check that 'statuscolumn' correctly applies numhl
- command('set statuscolumn=%s%=%l\\ ')
+ exec('set statuscolumn=%s%=%l\\ ')
screen:expect_unchanged()
end)
it('highlights the cursorline sign with culhl', function()
feed('ia<cr>b<cr>c<esc>')
- command('sign define piet text=>> texthl=Search culhl=ErrorMsg')
- command('sign place 1 line=1 name=piet buffer=1')
- command('sign place 2 line=2 name=piet buffer=1')
- command('sign place 3 line=3 name=piet buffer=1')
- command('set cursorline')
+ exec([[
+ sign define piet text=>> texthl=Search culhl=ErrorMsg
+ sign place 1 line=1 name=piet buffer=1
+ sign place 2 line=2 name=piet buffer=1
+ sign place 3 line=3 name=piet buffer=1
+ set cursorline
+ ]])
screen:expect([[
{1:>>}a |
{1:>>}b |
{8:>>}{3:^c }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*10
|
]])
feed('k')
@@ -189,411 +152,304 @@ describe('Signs', function()
{1:>>}a |
{8:>>}{3:^b }|
{1:>>}c |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*10
|
]])
- command('set nocursorline')
+ exec('set nocursorline')
screen:expect([[
{1:>>}a |
{1:>>}^b |
{1:>>}c |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*10
|
]])
- command('set cursorline cursorlineopt=line')
+ exec('set cursorline cursorlineopt=line')
screen:expect([[
{1:>>}a |
{1:>>}{3:^b }|
{1:>>}c |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*10
|
]])
- command('set cursorlineopt=number')
- command('hi! link SignColumn IncSearch')
+ exec('set cursorlineopt=number')
+ exec('hi! link SignColumn IncSearch')
feed('Go<esc>2G')
screen:expect([[
{1:>>}a |
{8:>>}^b |
{1:>>}c |
{5: } |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*9
|
]])
-- Check that 'statuscolumn' cursorline/signcolumn highlights are the same (#21726)
- command('set statuscolumn=%s')
+ exec('set statuscolumn=%s')
screen:expect_unchanged()
end)
it('multiple signs #9295', function()
feed('ia<cr>b<cr>c<cr><esc>')
- command('set number')
- command('set signcolumn=yes:2')
- command('sign define pietSearch text=>> texthl=Search')
- command('sign define pietError text=XX texthl=Error')
- command('sign define pietWarn text=WW texthl=Warning')
- command('sign place 1 line=1 name=pietSearch buffer=1')
- command('sign place 2 line=1 name=pietError buffer=1')
- -- Line 2 helps checking that signs in the same line are ordered by Id.
- command('sign place 4 line=2 name=pietSearch buffer=1')
- command('sign place 3 line=2 name=pietError buffer=1')
+ exec([[
+ set number
+ set signcolumn=yes:2
+ sign define pietSearch text=>> texthl=Search
+ sign define pietError text=XX texthl=Error
+ sign define pietWarn text=WW texthl=Warning
+ sign place 6 line=3 name=pietSearch buffer=1
+ sign place 7 line=3 name=pietWarn buffer=1
+ sign place 5 line=3 name=pietError buffer=1
+ ]])
-- Line 3 checks that with a limit over the maximum number
-- of signs, the ones with the highest Ids are being picked,
-- and presented by their sorted Id order.
- command('sign place 6 line=3 name=pietSearch buffer=1')
- command('sign place 7 line=3 name=pietWarn buffer=1')
- command('sign place 5 line=3 name=pietError buffer=1')
+ screen:expect([[
+ {2: }{6: 1 }a |
+ {2: }{6: 2 }b |
+ {1:>>}WW{6: 3 }c |
+ {2: }{6: 4 }^ |
+ {0:~ }|*9
+ |
+ ]])
+ exec([[
+ sign place 1 line=1 name=pietSearch buffer=1
+ sign place 2 line=1 name=pietError buffer=1
+ " Line 2 helps checking that signs in the same line are ordered by Id.
+ sign place 4 line=2 name=pietSearch buffer=1
+ sign place 3 line=2 name=pietError buffer=1
+ ]])
screen:expect([[
{1:>>}{8:XX}{6: 1 }a |
{8:XX}{1:>>}{6: 2 }b |
{1:>>}WW{6: 3 }c |
{2: }{6: 4 }^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*9
|
]])
-- With the default setting, we get the sign with the top id.
- command('set signcolumn=yes:1')
+ exec('set signcolumn=yes:1')
screen:expect([[
{8:XX}{6: 1 }a |
{1:>>}{6: 2 }b |
WW{6: 3 }c |
{2: }{6: 4 }^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*9
|
]])
-- "auto:3" accommodates all the signs we defined so far.
- command('set signcolumn=auto:3')
- screen:expect([[
+ exec('set signcolumn=auto:3')
+ local s3 = [[
{1:>>}{8:XX}{2: }{6: 1 }a |
{8:XX}{1:>>}{2: }{6: 2 }b |
{8:XX}{1:>>}WW{6: 3 }c |
{2: }{6: 4 }^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*9
|
- ]])
+ ]]
+ screen:expect(s3)
-- Check "yes:9".
- command('set signcolumn=yes:9')
+ exec('set signcolumn=yes:9')
screen:expect([[
{1:>>}{8:XX}{2: }{6: 1 }a |
{8:XX}{1:>>}{2: }{6: 2 }b |
{8:XX}{1:>>}WW{2: }{6: 3 }c |
{2: }{6: 4 }^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*9
|
]])
-- Check "auto:N" larger than the maximum number of signs defined in
-- a single line (same result as "auto:3").
- command('set signcolumn=auto:4')
- screen:expect{grid=[[
- {1:>>}{8:XX}{2: }{6: 1 }a |
- {8:XX}{1:>>}{2: }{6: 2 }b |
- {8:XX}{1:>>}WW{6: 3 }c |
- {2: }{6: 4 }^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- |
- ]]}
+ exec('set signcolumn=auto:4')
+ screen:expect(s3)
-- line deletion deletes signs.
- command('2d')
+ exec('3move1')
+ exec('2d')
screen:expect([[
- {1:>>}{8:XX}{2: }{6: 1 }a |
- {8:XX}{1:>>}WW{6: 2 }^c |
- {2: }{6: 3 } |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {1:>>}{8:XX}{6: 1 }a |
+ {8:XX}{1:>>}{6: 2 }^b |
+ {2: }{6: 3 } |
+ {0:~ }|*10
+ |
+ ]])
+ -- character deletion does not delete signs.
+ feed('x')
+ screen:expect([[
+ {1:>>}{8:XX}{6: 1 }a |
+ {8:XX}{1:>>}{6: 2 }^ |
+ {2: }{6: 3 } |
+ {0:~ }|*10
|
]])
end)
it('auto-resize sign column with minimum size (#13783)', function()
feed('ia<cr>b<cr>c<cr><esc>')
- command('set number')
+ exec('set number')
-- sign column should always accommodate at the minimum size
- command('set signcolumn=auto:1-3')
+ exec('set signcolumn=auto:1-3')
screen:expect([[
{2: }{6: 1 }a |
{2: }{6: 2 }b |
{2: }{6: 3 }c |
{2: }{6: 4 }^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*9
|
]])
-- should support up to 8 signs at minimum
- command('set signcolumn=auto:8-9')
+ exec('set signcolumn=auto:8-9')
screen:expect([[
{2: }{6: 1 }a |
{2: }{6: 2 }b |
{2: }{6: 3 }c |
{2: }{6: 4 }^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*9
|
]])
-- should keep the same sign size when signs are not exceeding
-- the minimum
- command('set signcolumn=auto:2-5')
- command('sign define pietSearch text=>> texthl=Search')
- command('sign place 1 line=1 name=pietSearch buffer=1')
+ exec('set signcolumn=auto:2-5')
+ exec('sign define pietSearch text=>> texthl=Search')
+ exec('sign place 1 line=1 name=pietSearch buffer=1')
screen:expect([[
{1:>>}{2: }{6: 1 }a |
{2: }{6: 2 }b |
{2: }{6: 3 }c |
{2: }{6: 4 }^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*9
|
]])
-- should resize itself when signs are exceeding minimum but
-- not over the maximum
- command('sign place 2 line=1 name=pietSearch buffer=1')
- command('sign place 3 line=1 name=pietSearch buffer=1')
- command('sign place 4 line=1 name=pietSearch buffer=1')
+ exec([[
+ sign place 2 line=1 name=pietSearch buffer=1
+ sign place 3 line=1 name=pietSearch buffer=1
+ sign place 4 line=1 name=pietSearch buffer=1
+ ]])
screen:expect([[
{1:>>>>>>>>}{6: 1 }a |
{2: }{6: 2 }b |
{2: }{6: 3 }c |
{2: }{6: 4 }^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*9
|
]])
-- should not increase size because sign with existing id is moved
- command('sign place 4 line=1 name=pietSearch buffer=1')
+ exec('sign place 4 line=1 name=pietSearch buffer=1')
screen:expect_unchanged()
- command('sign unplace 4')
+ exec('sign unplace 4')
screen:expect([[
{1:>>>>>>}{6: 1 }a |
{2: }{6: 2 }b |
{2: }{6: 3 }c |
{2: }{6: 4 }^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*9
|
]])
- command('sign place 4 line=1 name=pietSearch buffer=1')
+ exec('sign place 4 line=1 name=pietSearch buffer=1')
-- should keep the column at maximum size when signs are
-- exceeding the maximum
- command('sign place 5 line=1 name=pietSearch buffer=1')
- command('sign place 6 line=1 name=pietSearch buffer=1')
- command('sign place 7 line=1 name=pietSearch buffer=1')
- command('sign place 8 line=1 name=pietSearch buffer=1')
+ exec([[
+ sign place 5 line=1 name=pietSearch buffer=1
+ sign place 6 line=1 name=pietSearch buffer=1
+ sign place 7 line=1 name=pietSearch buffer=1
+ sign place 8 line=1 name=pietSearch buffer=1
+ ]])
screen:expect([[
{1:>>>>>>>>>>}{6: 1 }a |
{2: }{6: 2 }b |
{2: }{6: 3 }c |
{2: }{6: 4 }^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*9
|
]])
end)
it('ignores signs with no icon and text when calculating the signcolumn width', function()
feed('ia<cr>b<cr>c<cr><esc>')
- command('set number')
- command('set signcolumn=auto:2')
- command('sign define pietSearch text=>> texthl=Search')
- command('sign define pietError text= texthl=Error')
- command('sign place 2 line=1 name=pietError buffer=1')
+ exec([[
+ set number
+ set signcolumn=auto:2
+ sign define pietSearch text=>> texthl=Search
+ sign define pietError text= texthl=Error
+ sign place 2 line=1 name=pietError buffer=1
+ ]])
-- no signcolumn with only empty sign
screen:expect([[
{6: 1 }a |
{6: 2 }b |
{6: 3 }c |
{6: 4 }^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*9
|
]])
-- single column with 1 sign with text and one sign without
- command('sign place 1 line=1 name=pietSearch buffer=1')
+ exec('sign place 1 line=1 name=pietSearch buffer=1')
screen:expect([[
{1:>>}{6: 1 }a |
{2: }{6: 2 }b |
{2: }{6: 3 }c |
{2: }{6: 4 }^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*9
|
]])
end)
- it('shows the line number when signcolumn=number but no marks on a line have text', function()
+ it('signcolumn=number', 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')
+ exec([[
+ set number signcolumn=number
+ sign define pietSearch text=>> texthl=Search numhl=Error
+ sign define pietError text= texthl=Search numhl=Error
+ sign place 1 line=1 name=pietSearch buffer=1
+ sign place 2 line=2 name=pietError buffer=1
+ ]])
+ -- line number should be drawn if sign has no text
-- 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:~ }|
+ {0:~ }|*9
+ |
+ ]])
+ -- number column on wrapped part of a line should be empty
+ feed('gg100aa<Esc>')
+ screen:expect([[
+ {1: >> }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+ {8: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+ {8: }aa^a |
+ {8: 2 }b |
+ {6: 3 }c |
+ {6: 4 } |
+ {0:~ }|*7
+ |
+ ]])
+ api.nvim_buf_set_extmark(0, api.nvim_create_namespace('test'), 0, 0, {
+ virt_lines = { { { 'VIRT LINES' } } },
+ virt_lines_above = true,
+ })
+ feed('<C-Y>')
+ -- number column on virtual lines should be empty
+ screen:expect([[
+ {6: }VIRT LINES |
+ {1: >> }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+ {8: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+ {8: }aa^a |
+ {8: 2 }b |
+ {6: 3 }c |
+ {6: 4 } |
+ {0:~ }|*6
|
]])
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')
+ exec('sign define piet text=>> texthl=Search')
+ exec('sign place 100000 line=1 name=piet buffer=1')
feed(':sign place<cr>')
screen:expect([[
{1:>>} |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*6
{4: }|
:sign place |
{9:--- Signs ---} |
@@ -606,72 +462,45 @@ describe('Signs', function()
feed('<cr>')
screen:expect([[
{1:>>}^ |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*12
|
]])
end)
end)
it('signcolumn width is updated when removing all signs after deleting lines', function()
- meths.buf_set_lines(0, 0, 1, true, {'a', 'b', 'c', 'd', 'e'})
- command('sign define piet text=>>')
- command('sign place 10001 line=1 name=piet')
- command('sign place 10002 line=5 name=piet')
- command('2delete')
- command('sign unplace 10001')
+ api.nvim_buf_set_lines(0, 0, 1, true, { 'a', 'b', 'c', 'd', 'e' })
+ exec('sign define piet text=>>')
+ exec('sign place 10001 line=1 name=piet')
+ exec('sign place 10002 line=5 name=piet')
+ exec('2delete')
+ exec('sign unplace 10001')
screen:expect([[
{2: }a |
{2: }^c |
{2: }d |
>>e |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*9
|
]])
- command('sign unplace 10002')
+ exec('sign unplace 10002')
screen:expect([[
a |
^c |
d |
e |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*9
|
]])
end)
it('signcolumn width is updated when removing all signs after inserting lines', function()
- meths.buf_set_lines(0, 0, 1, true, {'a', 'b', 'c', 'd', 'e'})
- command('sign define piet text=>>')
- command('sign place 10001 line=1 name=piet')
- command('sign place 10002 line=5 name=piet')
- command('copy .')
- command('sign unplace 10001')
+ api.nvim_buf_set_lines(0, 0, 1, true, { 'a', 'b', 'c', 'd', 'e' })
+ exec('sign define piet text=>>')
+ exec('sign place 10001 line=1 name=piet')
+ exec('sign place 10002 line=5 name=piet')
+ exec('copy .')
+ exec('sign unplace 10001')
screen:expect([[
{2: }a |
{2: }^a |
@@ -679,16 +508,10 @@ describe('Signs', function()
{2: }c |
{2: }d |
>>e |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*7
|
]])
- command('sign unplace 10002')
+ exec('sign unplace 10002')
screen:expect([[
a |
^a |
@@ -696,20 +519,14 @@ describe('Signs', function()
c |
d |
e |
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
- {0:~ }|
+ {0:~ }|*7
|
]])
end)
it('numhl highlight is applied when signcolumn=no', function()
screen:try_resize(screen._width, 4)
- command([[
+ exec([[
set nu scl=no
call setline(1, ['line1', 'line2', 'line3'])
call nvim_buf_set_extmark(0, nvim_create_namespace('test'), 0, 0, {'number_hl_group':'Error'})
@@ -723,4 +540,39 @@ describe('Signs', function()
|
]])
end)
+
+ it('no negative b_signcols.count with undo after initializing', function()
+ exec([[
+ set signcolumn=auto:2
+ call setline(1, 'a')
+ call nvim_buf_set_extmark(0, nvim_create_namespace(''), 0, 0, {'sign_text':'S1'})
+ delete | redraw | undo
+ ]])
+ end)
+
+ it('sign not shown on line it was previously on after undo', function()
+ exec([[
+ call setline(1, range(1, 4))
+ call nvim_buf_set_extmark(0, nvim_create_namespace(''), 1, 0, {'sign_text':'S1'})
+ ]])
+ exec('norm 2Gdd')
+ exec('silent undo')
+ screen:expect([[
+ {2: }1 |
+ S1^2 |
+ {2: }3 |
+ {2: }4 |
+ {0:~ }|*9
+ |
+ ]])
+ end)
+
+ it('sign_undefine() frees all signs', function()
+ exec([[
+ sign define 1 text=1
+ sign define 2 text=2
+ call sign_undefine()
+ ]])
+ eq({}, eval('sign_getdefined()'))
+ end)
end)
generated by cgit (git 2.34.1) at 2025-04-28 14:00:58 +0000