aboutsummaryrefslogtreecommitdiff
path: root/test/functional/legacy
diff options
context:
space:
mode:
Diffstat (limited to 'test/functional/legacy')
-rw-r--r--test/functional/legacy/display_spec.lua32
-rw-r--r--test/functional/legacy/listchars_spec.lua128
-rw-r--r--test/functional/legacy/search_spec.lua32
3 files changed, 112 insertions, 80 deletions
diff --git a/test/functional/legacy/display_spec.lua b/test/functional/legacy/display_spec.lua
index 4c7915403c..ccc709cbf6 100644
--- a/test/functional/legacy/display_spec.lua
+++ b/test/functional/legacy/display_spec.lua
@@ -71,14 +71,14 @@ describe('display', function()
100wincmd <
]])
screen:expect([[
- ^a{3:│}aaa |
- a{3:│}bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
- a{3:│}bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
- b{3:│}{1:~ }|
- b{3:│}{1:~ }|
- b{3:│}{1:~ }|
- b{3:│}{1:~ }|
- {1:@}{3:│}{1:~ }|
+ ^a│aaa |
+ a│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
+ a│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
+ b│{1:~ }|
+ b│{1:~ }|
+ b│{1:~ }|
+ b│{1:~ }|
+ {1:@}│{1:~ }|
{2:< }{3:[No Name] [+] }|
|
]])
@@ -86,14 +86,14 @@ describe('display', function()
screen:expect_unchanged()
command('100wincmd >')
screen:expect([[
- ^aaa {3:│}a|
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb{3:│}a|
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb {3:│}a|
- {1:~ }{3:│}b|
- {1:~ }{3:│}b|
- {1:~ }{3:│}b|
- {1:~ }{3:│}b|
- {1:~ }{3:│}{1:@}|
+ ^aaa │a|
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb│a|
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb │a|
+ {1:~ }│b|
+ {1:~ }│b|
+ {1:~ }│b|
+ {1:~ }│b|
+ {1:~ }│{1:@}|
{2:[No Name] [+] }{3:<}|
|
]])
diff --git a/test/functional/legacy/listchars_spec.lua b/test/functional/legacy/listchars_spec.lua
index 206e226767..a94ec431d4 100644
--- a/test/functional/legacy/listchars_spec.lua
+++ b/test/functional/legacy/listchars_spec.lua
@@ -117,106 +117,106 @@ describe("'listchars'", function()
]])
feed('13<C-W>>')
screen:expect([[
- {4: }aaa {3:│}{4: }a{1:>}{3:│}{4: }^aaa |
- {4: } {3:│}{4: } {3:│}{4: } |
- {4: }a {3:│}{4: }a {3:│}{4: }a |
- {4: }aaaaaa {3:│}{4: }a{1:>}{3:│}{4: }aaaaaa |
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
+ {4: }aaa │{4: }a{1:>}│{4: }^aaa |
+ {4: } │{4: } │{4: } |
+ {4: }a │{4: }a │{4: }a |
+ {4: }aaaaaa │{4: }a{1:>}│{4: }aaaaaa |
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
{3:[No Name] [+] <[+] }{2:[No Name] [+] }|
|
]])
feed('<C-W>>')
screen:expect([[
- {4: }aaa {3:│}{4: }{1:>}{3:│}{4: }^aaa |
- {4: } {3:│}{4: } {3:│}{4: } |
- {4: }a {3:│}{4: }a{3:│}{4: }a |
- {4: }aaaaaa {3:│}{4: }{1:>}{3:│}{4: }aaaaaa |
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
+ {4: }aaa │{4: }{1:>}│{4: }^aaa |
+ {4: } │{4: } │{4: } |
+ {4: }a │{4: }a│{4: }a |
+ {4: }aaaaaa │{4: }{1:>}│{4: }aaaaaa |
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
{3:[No Name] [+] <+] }{2:[No Name] [+] }|
|
]])
feed('<C-W>>')
screen:expect([[
- {4: }aaa {3:│}{4: }{3:│}{4: }^aaa |
- {4: } {3:│}{4: }{3:│}{4: } |
- {4: }a {3:│}{4: }{3:│}{4: }a |
- {4: }aaaaaa {3:│}{4: }{3:│}{4: }aaaaaa |
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
+ {4: }aaa │{4: }│{4: }^aaa |
+ {4: } │{4: }│{4: } |
+ {4: }a │{4: }│{4: }a |
+ {4: }aaaaaa │{4: }│{4: }aaaaaa |
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
{3:[No Name] [+] <] }{2:[No Name] [+] }|
|
]])
feed('<C-W>>')
screen:expect([[
- {4: }aaa {3:│}{4: }{3:│}{4: }^aaa |
- {4: } {3:│}{4: }{3:│}{4: } |
- {4: }a {3:│}{4: }{3:│}{4: }a |
- {4: }aaaaaa {3:│}{4: }{3:│}{4: }aaaaaa |
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
+ {4: }aaa │{4: }│{4: }^aaa |
+ {4: } │{4: }│{4: } |
+ {4: }a │{4: }│{4: }a |
+ {4: }aaaaaa │{4: }│{4: }aaaaaa |
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
{3:[No Name] [+] < }{2:[No Name] [+] }|
|
]])
feed('<C-W>>')
screen:expect([[
- {4: }aaa {3:│}{4: }{3:│}{4: }^aaa |
- {4: } {3:│}{4: }{3:│}{4: } |
- {4: }a {3:│}{4: }{3:│}{4: }a |
- {4: }aaaaaa {3:│}{4: }{3:│}{4: }aaaaaa |
- {1:~ }{3:│}{1:~}{3:│}{1:~ }|
- {1:~ }{3:│}{1:~}{3:│}{1:~ }|
- {1:~ }{3:│}{1:~}{3:│}{1:~ }|
- {1:~ }{3:│}{1:~}{3:│}{1:~ }|
+ {4: }aaa │{4: }│{4: }^aaa |
+ {4: } │{4: }│{4: } |
+ {4: }a │{4: }│{4: }a |
+ {4: }aaaaaa │{4: }│{4: }aaaaaa |
+ {1:~ }│{1:~}│{1:~ }|
+ {1:~ }│{1:~}│{1:~ }|
+ {1:~ }│{1:~}│{1:~ }|
+ {1:~ }│{1:~}│{1:~ }|
{3:[No Name] [+] < }{2:[No Name] [+] }|
|
]])
feed('<C-W>h')
feed_command('set nowrap foldcolumn=4')
screen:expect([[
- {4: }aaa {3:│}{4: }^aaa {3:│}{4: }aaa |
- {4: } {3:│}{4: } {3:│}{4: } |
- {4: }a {3:│}{4: }a {3:│}{4: }a |
- {4: }aaaaaa {3:│}{4: }aaaaaa {3:│}{4: }aaaaaa |
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
+ {4: }aaa │{4: }^aaa │{4: }aaa |
+ {4: } │{4: } │{4: } |
+ {4: }a │{4: }a │{4: }a |
+ {4: }aaaaaa │{4: }aaaaaa │{4: }aaaaaa |
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
{3:[No Name] [+] }{2:[No Name] [+] }{3:[No Name] [+] }|
:set nowrap foldcolumn=4 |
]])
feed('15<C-W><lt>')
screen:expect([[
- {4: }aaa {3:│}{4: }{3:│}{4: }aaa |
- {4: } {3:│}{4: }{3:│}{4: } |
- {4: }a {3:│}{4: }{3:│}{4: }a |
- {4: }aaaaaa {3:│}{4: ^ }{3:│}{4: }aaaaaa |
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
+ {4: }aaa │{4: }│{4: }aaa |
+ {4: } │{4: }│{4: } |
+ {4: }a │{4: }│{4: }a |
+ {4: }aaaaaa │{4: ^ }│{4: }aaaaaa |
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
{3:[No Name] [+] }{2:<[+] }{3:[No Name] [+] }|
:set nowrap foldcolumn=4 |
]])
feed('4<C-W><lt>')
screen:expect([[
- {4: }aaa {3:│}{4: }{3:│}{4: }aaa |
- {4: } {3:│}{4: }{3:│}{4: } |
- {4: }a {3:│}{4: }{3:│}{4: }a |
- {4: }aaaaaa {3:│}{4:^ }{3:│}{4: }aaaaaa |
- {1:~ }{3:│}{1:~}{3:│}{1:~ }|
- {1:~ }{3:│}{1:~}{3:│}{1:~ }|
- {1:~ }{3:│}{1:~}{3:│}{1:~ }|
- {1:~ }{3:│}{1:~}{3:│}{1:~ }|
+ {4: }aaa │{4: }│{4: }aaa |
+ {4: } │{4: }│{4: } |
+ {4: }a │{4: }│{4: }a |
+ {4: }aaaaaa │{4:^ }│{4: }aaaaaa |
+ {1:~ }│{1:~}│{1:~ }|
+ {1:~ }│{1:~}│{1:~ }|
+ {1:~ }│{1:~}│{1:~ }|
+ {1:~ }│{1:~}│{1:~ }|
{3:[No Name] [+] }{2:< }{3:[No Name] [+] }|
:set nowrap foldcolumn=4 |
]])
diff --git a/test/functional/legacy/search_spec.lua b/test/functional/legacy/search_spec.lua
index 4ed08881de..67991f5d48 100644
--- a/test/functional/legacy/search_spec.lua
+++ b/test/functional/legacy/search_spec.lua
@@ -7,6 +7,7 @@ local eval = helpers.eval
local feed = helpers.feed
local funcs = helpers.funcs
local poke_eventloop = helpers.poke_eventloop
+local exec = helpers.exec
describe('search cmdline', function()
local screen
@@ -640,3 +641,34 @@ describe('search cmdline', function()
feed('<esc>')
end)
end)
+
+describe('Search highlight', function()
+ before_each(clear)
+ it('Search highlight is combined with Visual highlight vim-patch:8.2.2797', function()
+ local screen = Screen.new(40, 6)
+ screen:set_default_attr_ids({
+ [1] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
+ [2] = {bold = true}, -- ModeMsg, Search
+ [3] = {background = Screen.colors.LightGrey}, -- Visual
+ [4] = {background = Screen.colors.Yellow, bold = true}, -- Search
+ [5] = {background = Screen.colors.LightGrey, bold = true}, -- Visual + Search
+ })
+ screen:attach()
+ exec([[
+ set hlsearch noincsearch
+ call setline(1, repeat(["xxx yyy zzz"], 3))
+ hi Search gui=bold
+ /yyy
+ call cursor(1, 6)
+ ]])
+ feed('vjj')
+ screen:expect([[
+ xxx {4:y}{5:yy}{3: zzz} |
+ {3:xxx }{5:yyy}{3: zzz} |
+ {3:xxx }{5:y}{4:^yy} zzz |
+ {1:~ }|
+ {1:~ }|
+ {2:-- VISUAL --} |
+ ]])
+ end)
+end)
generated by cgit (git 2.34.1) at 2025-09-24 14:47:11 +0000