aboutsummaryrefslogtreecommitdiff
path: root/test/functional/ui/sign_spec.lua
diff options
context:
space:
mode:
authorJosh Rahm <joshuarahm@gmail.com>2024-05-24 19:18:11 +0000
committerJosh Rahm <joshuarahm@gmail.com>2024-05-24 19:18:11 +0000
commitff7ed8f586589d620a806c3758fac4a47a8e7e15 (patch)
tree729bbcb92231538fa61dab6c3d890b025484b7f5 /test/functional/ui/sign_spec.lua
parent376914f419eb08fdf4c1a63a77e1f035898a0f10 (diff)
parent28c04948a1c887a1cc0cb64de79fa32631700466 (diff)
downloadrneovim-ff7ed8f586589d620a806c3758fac4a47a8e7e15.tar.gz
rneovim-ff7ed8f586589d620a806c3758fac4a47a8e7e15.tar.bz2
rneovim-ff7ed8f586589d620a806c3758fac4a47a8e7e15.zip
Merge remote-tracking branch 'upstream/master' into mix_20240309
Diffstat (limited to 'test/functional/ui/sign_spec.lua')
-rw-r--r--test/functional/ui/sign_spec.lua36
1 files changed, 19 insertions, 17 deletions
diff --git a/test/functional/ui/sign_spec.lua b/test/functional/ui/sign_spec.lua
index 847a918dc9..b353b3738a 100644
--- a/test/functional/ui/sign_spec.lua
+++ b/test/functional/ui/sign_spec.lua
@@ -1,7 +1,9 @@
-local helpers = require('test.functional.helpers')(after_each)
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
local Screen = require('test.functional.ui.screen')
-local api, clear, eq = helpers.api, helpers.clear, helpers.eq
-local eval, exec, feed = helpers.eval, helpers.exec, helpers.feed
+
+local api, clear, eq = n.api, n.clear, t.eq
+local eval, exec, feed = n.eval, n.exec, n.feed
describe('Signs', function()
local screen
@@ -205,7 +207,7 @@ describe('Signs', function()
screen:expect([[
{2: }{6: 1 }a |
{2: }{6: 2 }b |
- {1:>>}WW{6: 3 }c |
+ WW{1:>>}{6: 3 }c |
{2: }{6: 4 }^ |
{0:~ }|*9
|
@@ -218,9 +220,9 @@ describe('Signs', function()
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 |
+ {8:XX}{1:>>}{6: 1 }a |
+ {1:>>}{8:XX}{6: 2 }b |
+ WW{1:>>}{6: 3 }c |
{2: }{6: 4 }^ |
{0:~ }|*9
|
@@ -238,9 +240,9 @@ describe('Signs', function()
-- "auto:3" accommodates all the signs we defined so far.
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 |
+ {8:XX}{1:>>}{2: }{6: 1 }a |
+ {1:>>}{8:XX}{2: }{6: 2 }b |
+ WW{1:>>}{8:XX}{6: 3 }c |
{2: }{6: 4 }^ |
{0:~ }|*9
|
@@ -249,9 +251,9 @@ describe('Signs', function()
-- Check "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 |
+ {8:XX}{1:>>}{2: }{6: 1 }a |
+ {1:>>}{8:XX}{2: }{6: 2 }b |
+ WW{1:>>}{8:XX}{2: }{6: 3 }c |
{2: }{6: 4 }^ |
{0:~ }|*9
|
@@ -264,8 +266,8 @@ describe('Signs', function()
exec('3move1')
exec('2d')
screen:expect([[
- {1:>>}{8:XX}{6: 1 }a |
- {8:XX}{1:>>}{6: 2 }^b |
+ {8:XX}{1:>>}{6: 1 }a |
+ {1:>>}{8:XX}{6: 2 }^b |
{2: }{6: 3 } |
{0:~ }|*10
|
@@ -273,8 +275,8 @@ describe('Signs', function()
-- character deletion does not delete signs.
feed('x')
screen:expect([[
- {1:>>}{8:XX}{6: 1 }a |
- {8:XX}{1:>>}{6: 2 }^ |
+ {8:XX}{1:>>}{6: 1 }a |
+ {1:>>}{8:XX}{6: 2 }^ |
{2: }{6: 3 } |
{0:~ }|*10
|