diff options
30 files changed, 580 insertions, 857 deletions
diff --git a/test/functional/legacy/063_match_and_matchadd_spec.lua b/test/functional/legacy/063_match_and_matchadd_spec.lua index 0c2b59932b..b875d32e56 100644 --- a/test/functional/legacy/063_match_and_matchadd_spec.lua +++ b/test/functional/legacy/063_match_and_matchadd_spec.lua @@ -12,10 +12,6 @@ describe('063: Test for ":match", "matchadd()" and related functions', function( it('is working', function() local screen = Screen.new(40, 5) screen:attach() - screen:set_default_attr_ids({ - [0] = { bold = true, foreground = Screen.colors.Blue }, - [1] = { background = Screen.colors.Red }, - }) command('highlight MyGroup1 term=bold ctermbg=red guibg=red') command('highlight MyGroup2 term=italic ctermbg=green guibg=green') @@ -25,8 +21,8 @@ describe('063: Test for ":match", "matchadd()" and related functions', function( insert('abcdefghijklmnopq') command("call matchaddpos('MyGroup1', [[1, 5], [1, 8, 3]], 10, 3)") screen:expect([[ - abcd{1:e}fg{1:hij}klmnop^q | - {0:~ }|*3 + abcd{30:e}fg{30:hij}klmnop^q | + {1:~ }|*3 | ]]) @@ -34,8 +30,8 @@ describe('063: Test for ":match", "matchadd()" and related functions', function( command("call setline(1, 'abcdΣabcdef')") command("call matchaddpos('MyGroup1', [[1, 4, 2], [1, 9, 2]])") screen:expect([[ - abc{1:dΣ}ab{1:cd}e^f | - {0:~ }|*3 + abc{30:dΣ}ab{30:cd}e^f | + {1:~ }|*3 | ]]) end) diff --git a/test/functional/legacy/breakindent_spec.lua b/test/functional/legacy/breakindent_spec.lua index cf0065f394..dd18e5664b 100644 --- a/test/functional/legacy/breakindent_spec.lua +++ b/test/functional/legacy/breakindent_spec.lua @@ -67,50 +67,43 @@ describe('breakindent', function() setlocal breakindent call setline(1, "\t" .. join(range(100))) ]]) - screen:set_default_attr_ids({ - [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText - [1] = { background = Screen.colors.LightGrey, foreground = Screen.colors.Black }, -- Visual - [2] = { bold = true, reverse = true }, -- StatusLine - [3] = { reverse = true }, -- StatusLineNC - [4] = { bold = true }, -- ModeMsg - }) screen:attach() feed('v$') screen:expect([[ - {0:<<<} {1: 93 94 95 96 97 98 99}^ | - {2:[No Name] [+] }| + {1:<<<} {17: 93 94 95 96 97 98 99}^ | + {3:[No Name] [+] }| | - {0:~ }| - {3:[No Name] }| - {4:-- VISUAL --} | + {1:~ }| + {2:[No Name] }| + {5:-- VISUAL --} | ]]) command('setlocal showbreak=+++') screen:expect([[ - {0:+++}{1: 90 91 92 93 94 95 96 97 98 99}^ | - {2:[No Name] [+] }| + {1:+++}{17: 90 91 92 93 94 95 96 97 98 99}^ | + {3:[No Name] [+] }| | - {0:~ }| - {3:[No Name] }| - {4:-- VISUAL --} | + {1:~ }| + {2:[No Name] }| + {5:-- VISUAL --} | ]]) command('setlocal breakindentopt+=sbr') screen:expect([[ - {0:+++} {1: 93 94 95 96 97 98 99}^ | - {2:[No Name] [+] }| + {1:+++} {17: 93 94 95 96 97 98 99}^ | + {3:[No Name] [+] }| | - {0:~ }| - {3:[No Name] }| - {4:-- VISUAL --} | + {1:~ }| + {2:[No Name] }| + {5:-- VISUAL --} | ]]) command('setlocal nobreakindent') screen:expect([[ - {0:+++}{1: 98 99}^ | - {2:[No Name] [+] }| + {1:+++}{17: 98 99}^ | + {3:[No Name] [+] }| | - {0:~ }| - {3:[No Name] }| - {4:-- VISUAL --} | + {1:~ }| + {2:[No Name] }| + {5:-- VISUAL --} | ]]) end) end) diff --git a/test/functional/legacy/cmdline_spec.lua b/test/functional/legacy/cmdline_spec.lua index 4d450965cf..6b9f746826 100644 --- a/test/functional/legacy/cmdline_spec.lua +++ b/test/functional/legacy/cmdline_spec.lua @@ -15,12 +15,6 @@ describe('cmdline', function() it('is cleared when switching tabs', function() local screen = Screen.new(30, 10) screen:attach() - screen:set_default_attr_ids { - [1] = { underline = true, background = Screen.colors.LightGrey }, - [2] = { bold = true }, - [3] = { reverse = true }, - [4] = { bold = true, foreground = Screen.colors.Blue1 }, - } feed_command([[call setline(1, range(30))]]) screen:expect([[ @@ -39,9 +33,9 @@ describe('cmdline', function() feed [[:tabnew<cr>]] screen:expect { grid = [[ - {1: + [No Name] }{2: [No Name] }{3: }{1:X}| + {24: + [No Name] }{5: [No Name] }{2: }{24:X}| ^ | - {4:~ }|*7 + {1:~ }|*7 :tabnew | ]], } @@ -49,9 +43,9 @@ describe('cmdline', function() feed [[<C-w>-<C-w>-]] screen:expect { grid = [[ - {1: + [No Name] }{2: [No Name] }{3: }{1:X}| + {24: + [No Name] }{5: [No Name] }{2: }{24:X}| ^ | - {4:~ }|*5 + {1:~ }|*5 |*3 ]], } @@ -59,7 +53,7 @@ describe('cmdline', function() feed [[gt]] screen:expect { grid = [[ - {2: + [No Name] }{1: [No Name] }{3: }{1:X}| + {5: + [No Name] }{24: [No Name] }{2: }{24:X}| ^0 | 1 | 2 | @@ -74,9 +68,9 @@ describe('cmdline', function() feed [[gt]] screen:expect([[ - {1: + [No Name] }{2: [No Name] }{3: }{1:X}| + {24: + [No Name] }{5: [No Name] }{2: }{24:X}| ^ | - {4:~ }|*5 + {1:~ }|*5 |*3 ]]) end) @@ -109,10 +103,6 @@ describe('cmdline', function() -- oldtest: Test_cmdline_redraw_tabline() it('tabline is redrawn on entering cmdline', function() local screen = Screen.new(30, 6) - screen:set_default_attr_ids({ - [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText - [1] = { reverse = true }, -- TabLineFill - }) screen:attach() exec([[ set showtabline=2 @@ -120,9 +110,9 @@ describe('cmdline', function() ]]) feed(':') screen:expect([[ - {1:foo }| + {2:foo }| | - {0:~ }|*3 + {1:~ }|*3 :^ | ]]) end) @@ -130,9 +120,6 @@ describe('cmdline', function() -- oldtest: Test_redraw_in_autocmd() it('cmdline cursor position is correct after :redraw with cmdheight=2', function() local screen = Screen.new(30, 6) - screen:set_default_attr_ids({ - [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText - }) screen:attach() exec([[ set cmdheight=2 @@ -141,7 +128,7 @@ describe('cmdline', function() feed(':for i in range(3)<CR>') screen:expect([[ | - {0:~ }|*3 + {1:~ }|*3 :for i in range(3) | : ^ | ]]) @@ -149,7 +136,7 @@ describe('cmdline', function() -- Note: this may still be considered broken, ref #18140 screen:expect([[ | - {0:~ }|*3 + {1:~ }|*3 : :let i =^ | | ]]) @@ -157,10 +144,6 @@ describe('cmdline', function() it("setting 'cmdheight' works after outputting two messages vim-patch:9.0.0665", function() local screen = Screen.new(60, 8) - screen:set_default_attr_ids({ - [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText - [1] = { bold = true, reverse = true }, -- StatusLine - }) screen:attach() exec([[ set cmdheight=1 laststatus=2 @@ -175,15 +158,15 @@ describe('cmdline', function() feed(':call EchoTwo()') screen:expect([[ | - {0:~ }|*5 - {1:[No Name] }| + {1:~ }|*5 + {3:[No Name] }| :call EchoTwo()^ | ]]) feed('<CR>') screen:expect([[ ^ | - {0:~ }|*5 - {1:[No Name] }| + {1:~ }|*5 + {3:[No Name] }| | ]]) end) @@ -191,21 +174,15 @@ describe('cmdline', function() -- oldtest: Test_cmdheight_tabline() it("changing 'cmdheight' when there is a tabline", function() local screen = Screen.new(60, 8) - screen:set_default_attr_ids({ - [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText - [1] = { bold = true, reverse = true }, -- StatusLine - [2] = { bold = true }, -- TabLineSel - [3] = { reverse = true }, -- TabLineFill - }) screen:attach() api.nvim_set_option_value('laststatus', 2, {}) api.nvim_set_option_value('showtabline', 2, {}) api.nvim_set_option_value('cmdheight', 1, {}) screen:expect([[ - {2: [No Name] }{3: }| + {5: [No Name] }{2: }| ^ | - {0:~ }|*4 - {1:[No Name] }| + {1:~ }|*4 + {3:[No Name] }| | ]]) end) @@ -213,9 +190,6 @@ describe('cmdline', function() -- oldtest: Test_rulerformat_position() it("ruler has correct position with 'rulerformat' set", function() local screen = Screen.new(20, 3) - screen:set_default_attr_ids { - [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText - } screen:attach() api.nvim_set_option_value('ruler', true, {}) api.nvim_set_option_value('rulerformat', 'longish', {}) @@ -224,7 +198,7 @@ describe('cmdline', function() feed [[<C-W>v<C-W>|<C-W>p]] screen:expect [[ │^ | - {0:~ }│{0:~}| + {1:~ }│{1:~}| longish | ]] end) diff --git a/test/functional/legacy/conceal_spec.lua b/test/functional/legacy/conceal_spec.lua index e2cc3b23df..a28c3058b2 100644 --- a/test/functional/legacy/conceal_spec.lua +++ b/test/functional/legacy/conceal_spec.lua @@ -19,12 +19,6 @@ describe('Conceal', function() -- oldtest: Test_conceal_two_windows() it('works', function() local screen = Screen.new(75, 12) - screen:set_default_attr_ids({ - [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText - [1] = { bold = true, reverse = true }, -- StatusLine - [2] = { reverse = true }, -- StatusLineNC, IncSearch - [3] = { bold = true }, -- ModeMsg - }) screen:attach() exec([[ let lines = ["one one one one one", "two |hidden| here", "three |hidden| three"] @@ -48,12 +42,12 @@ describe('Conceal', function() two ^here | three three | Second window | - {0:~ }| - {1:[No Name] [+] }| + {1:~ }| + {3:[No Name] [+] }| one one one one one | two here | three three | - {0:~ }| + {1:~ }| {2:[No Name] [+] }| /here | ]]) @@ -65,12 +59,12 @@ describe('Conceal', function() two here | three three | Second window | - {0:~ }| - {1:[No Name] [+] }| + {1:~ }| + {3:[No Name] [+] }| one one one one one | two here | three three | - {0:~ }| + {1:~ }| {2:[No Name] [+] }| /here | ]]) @@ -83,12 +77,12 @@ describe('Conceal', function() two |hidden| ^here | three three | Second window | - {0:~ }| - {1:[No Name] [+] }| + {1:~ }| + {3:[No Name] [+] }| one one one one one | two here | three three | - {0:~ }| + {1:~ }| {2:[No Name] [+] }| /here | ]]) @@ -100,12 +94,12 @@ describe('Conceal', function() two here | three |hidden^| three | Second window | - {0:~ }| - {1:[No Name] [+] }| + {1:~ }| + {3:[No Name] [+] }| one one one one one | two here | three three | - {0:~ }| + {1:~ }| {2:[No Name] [+] }| /here | ]]) @@ -117,13 +111,13 @@ describe('Conceal', function() two here | three three | Second window | - {0:~ }| + {1:~ }| {2:[No Name] [+] }| one one one one one | two |hidden| ^here | three three | - {0:~ }| - {1:[No Name] [+] }| + {1:~ }| + {3:[No Name] [+] }| /here | ]]) @@ -134,13 +128,13 @@ describe('Conceal', function() two here | three three | Second window | - {0:~ }| + {1:~ }| {2:[No Name] [+] }| one one one one one | two ^here | three three | - {0:~ }| - {1:[No Name] [+] }| + {1:~ }| + {3:[No Name] [+] }| /here | ]]) feed('a') @@ -149,14 +143,14 @@ describe('Conceal', function() two here | three three | Second window | - {0:~ }| + {1:~ }| {2:[No Name] [+] }| one one one one one | two |hidden| h^ere | three three | - {0:~ }| - {1:[No Name] [+] }| - {3:-- INSERT --} | + {1:~ }| + {3:[No Name] [+] }| + {5:-- INSERT --} | ]]) feed('<Esc>/e') screen:expect([[ @@ -164,13 +158,13 @@ describe('Conceal', function() two here | three three | Second window | - {0:~ }| + {1:~ }| {2:[No Name] [+] }| one one one one one | two |hidden| h{2:e}re | three three | - {0:~ }| - {1:[No Name] [+] }| + {1:~ }| + {3:[No Name] [+] }| /e^ | ]]) feed('<Esc>v') @@ -179,14 +173,14 @@ describe('Conceal', function() two here | three three | Second window | - {0:~ }| + {1:~ }| {2:[No Name] [+] }| one one one one one | two |hidden| ^here | three three | - {0:~ }| - {1:[No Name] [+] }| - {3:-- VISUAL --} | + {1:~ }| + {3:[No Name] [+] }| + {5:-- VISUAL --} | ]]) feed('<Esc>') @@ -197,13 +191,13 @@ describe('Conceal', function() two here | three three | Second window | - {0:~ }| + {1:~ }| {2:[No Name] [+] }| one one one one one | two |hidden| ^here | three three | - {0:~ }| - {1:[No Name] [+] }| + {1:~ }| + {3:[No Name] [+] }| | ]]) feed('a') @@ -212,14 +206,14 @@ describe('Conceal', function() two here | three three | Second window | - {0:~ }| + {1:~ }| {2:[No Name] [+] }| one one one one one | two h^ere | three three | - {0:~ }| - {1:[No Name] [+] }| - {3:-- INSERT --} | + {1:~ }| + {3:[No Name] [+] }| + {5:-- INSERT --} | ]]) feed('<Esc>/e') screen:expect([[ @@ -227,13 +221,13 @@ describe('Conceal', function() two here | three three | Second window | - {0:~ }| + {1:~ }| {2:[No Name] [+] }| one one one one one | two |hidden| h{2:e}re | three three | - {0:~ }| - {1:[No Name] [+] }| + {1:~ }| + {3:[No Name] [+] }| /e^ | ]]) feed('<Esc>v') @@ -242,14 +236,14 @@ describe('Conceal', function() two here | three three | Second window | - {0:~ }| + {1:~ }| {2:[No Name] [+] }| one one one one one | two |hidden| ^here | three three | - {0:~ }| - {1:[No Name] [+] }| - {3:-- VISUAL --} | + {1:~ }| + {3:[No Name] [+] }| + {5:-- VISUAL --} | ]]) feed('<Esc>') @@ -260,13 +254,13 @@ describe('Conceal', function() two here | three three | Second window | - {0:~ }| + {1:~ }| {2:[No Name] [+] }| one one one one one | two |hidden| ^here | three three | - {0:~ }| - {1:[No Name] [+] }| + {1:~ }| + {3:[No Name] [+] }| | ]]) feed('a') @@ -275,14 +269,14 @@ describe('Conceal', function() two here | three three | Second window | - {0:~ }| + |