aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/functional/core/main_spec.lua13
-rw-r--r--test/functional/terminal/cursor_spec.lua494
-rw-r--r--test/functional/ui/cursor_spec.lua2
-rw-r--r--test/functional/ui/embed_spec.lua9
4 files changed, 256 insertions, 262 deletions
diff --git a/test/functional/core/main_spec.lua b/test/functional/core/main_spec.lua
index 723bcbe153..0501a75bd6 100644
--- a/test/functional/core/main_spec.lua
+++ b/test/functional/core/main_spec.lua
@@ -72,15 +72,12 @@ describe('command-line option', function()
env = { VIMRUNTIME = os.getenv('VIMRUNTIME') }
})
screen:expect([[
- {1:^ }|
- {2:~ }|*4
- {3:[No Name] 0,0-1 All}|
- {1: }|
- |
+ ^ |
+ ~ |*4
+ {1:[No Name] 0,0-1 All}|
+ |*2
]], {
- [1] = {bg_indexed = true, foreground = Screen.colors.Grey91, background = tonumber('0x161616'), fg_indexed = true},
- [2] = {bg_indexed = true, foreground = Screen.colors.Gray30, background = tonumber('0x161616'), fg_indexed = true},
- [3] = {bg_indexed = true, foreground = tonumber('0xd2d2d2'), background = Screen.colors.Black , fg_indexed = true},
+ [1] = {reverse = true};
})
feed('i:cq<CR>')
screen:expect([[
diff --git a/test/functional/terminal/cursor_spec.lua b/test/functional/terminal/cursor_spec.lua
index 95d601e3f0..5a40477d28 100644
--- a/test/functional/terminal/cursor_spec.lua
+++ b/test/functional/terminal/cursor_spec.lua
@@ -168,17 +168,17 @@ describe('buffer cursor position is correct in terminal without number column',
})
screen:set_default_attr_ids({
[1] = {foreground = 253, background = 11};
+ [2] = {reverse = true};
[3] = {bold = true},
- [16] = {background = 234, foreground = 253};
- [17] = {reverse = true, background = 234, foreground = 253};
+ [4] = {background = 11};
})
-- Also check for real cursor position, as it is used for stuff like input methods
screen._handle_busy_start = function() end
screen._handle_busy_stop = function() end
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::}{17:^ }{16: }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :{2:^ } |
{3:-- TERMINAL --} |
]])
end
@@ -193,17 +193,17 @@ describe('buffer cursor position is correct in terminal without number column',
it('at the end', function()
feed('<C-R>r')
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::aaaaaaaa}{17:^ }{16: }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :aaaaaaaa{2:^ } |
{3:-- TERMINAL --} |
]])
eq({6, 9}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::aaaaaaa^a}{1: }{16: }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :aaaaaaa^a{4: } |
|
]])
eq({6, 8}, eval('nvim_win_get_cursor(0)'))
@@ -212,17 +212,17 @@ describe('buffer cursor position is correct in terminal without number column',
it('near the end', function()
feed('<C-R>r<C-X><C-X>')
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::aaaaaa}{17:^a}{16:a }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :aaaaaa{2:^a}a |
{3:-- TERMINAL --} |
]])
eq({6, 7}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::aaaaa^a}{1:a}{16:a }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :aaaaa^a{4:a}a |
|
]])
eq({6, 6}, eval('nvim_win_get_cursor(0)'))
@@ -231,17 +231,17 @@ describe('buffer cursor position is correct in terminal without number column',
it('near the start', function()
feed('<C-R>r<C-B><C-O>')
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::a}{17:^a}{16:aaaaaa }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :a{2:^a}aaaaaa |
{3:-- TERMINAL --} |
]])
eq({6, 2}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::^a}{1:a}{16:aaaaaa }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :^a{4:a}aaaaaa |
|
]])
eq({6, 1}, eval('nvim_win_get_cursor(0)'))
@@ -256,17 +256,17 @@ describe('buffer cursor position is correct in terminal without number column',
it('at the end', function()
feed('<C-R>r')
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::µµµµµµµµ}{17:^ }{16: }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :µµµµµµµµ{2:^ } |
{3:-- TERMINAL --} |
]])
eq({6, 17}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::µµµµµµµ^µ}{1: }{16: }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :µµµµµµµ^µ{4: } |
|
]])
eq({6, 15}, eval('nvim_win_get_cursor(0)'))
@@ -275,17 +275,17 @@ describe('buffer cursor position is correct in terminal without number column',
it('near the end', function()
feed('<C-R>r<C-X><C-X>')
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::µµµµµµ}{17:^µ}{16:µ }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :µµµµµµ{2:^µ}µ |
{3:-- TERMINAL --} |
]])
eq({6, 13}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::µµµµµ^µ}{1:µ}{16:µ }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :µµµµµ^µ{4:µ}µ |
|
]])
eq({6, 11}, eval('nvim_win_get_cursor(0)'))
@@ -294,17 +294,17 @@ describe('buffer cursor position is correct in terminal without number column',
it('near the start', function()
feed('<C-R>r<C-B><C-O>')
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::µ}{17:^µ}{16:µµµµµµ }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :µ{2:^µ}µµµµµµ |
{3:-- TERMINAL --} |
]])
eq({6, 3}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::^µ}{1:µ}{16:µµµµµµ }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :^µ{4:µ}µµµµµµ |
|
]])
eq({6, 1}, eval('nvim_win_get_cursor(0)'))
@@ -321,17 +321,17 @@ describe('buffer cursor position is correct in terminal without number column',
it('at the end', function()
feed('<C-R>r')
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::µ̳µ̳µ̳µ̳µ̳µ̳µ̳µ̳}{17:^ }{16: }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :µ̳µ̳µ̳µ̳µ̳µ̳µ̳µ̳{2:^ } |
{3:-- TERMINAL --} |
]])
eq({6, 33}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::µ̳µ̳µ̳µ̳µ̳µ̳µ̳^µ̳}{1: }{16: }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :µ̳µ̳µ̳µ̳µ̳µ̳µ̳^µ̳{4: } |
|
]])
eq({6, 29}, eval('nvim_win_get_cursor(0)'))
@@ -340,17 +340,17 @@ describe('buffer cursor position is correct in terminal without number column',
it('near the end', function()
feed('<C-R>r<C-X><C-X>')
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::µ̳µ̳µ̳µ̳µ̳µ̳}{17:^µ̳}{16:µ̳ }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :µ̳µ̳µ̳µ̳µ̳µ̳{2:^µ̳}µ̳ |
{3:-- TERMINAL --} |
]])
eq({6, 25}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::µ̳µ̳µ̳µ̳µ̳^µ̳}{1:µ̳}{16:µ̳ }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :µ̳µ̳µ̳µ̳µ̳^µ̳{4:µ̳}µ̳ |
|
]])
eq({6, 21}, eval('nvim_win_get_cursor(0)'))
@@ -359,17 +359,17 @@ describe('buffer cursor position is correct in terminal without number column',
it('near the start', function()
feed('<C-R>r<C-B><C-O>')
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::µ̳}{17:^µ̳}{16:µ̳µ̳µ̳µ̳µ̳µ̳ }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :µ̳{2:^µ̳}µ̳µ̳µ̳µ̳µ̳µ̳ |
{3:-- TERMINAL --} |
]])
eq({6, 5}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::^µ̳}{1:µ̳}{16:µ̳µ̳µ̳µ̳µ̳µ̳ }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :^µ̳{4:µ̳}µ̳µ̳µ̳µ̳µ̳µ̳ |
|
]])
eq({6, 1}, eval('nvim_win_get_cursor(0)'))
@@ -386,17 +386,17 @@ describe('buffer cursor position is correct in terminal without number column',
it('at the end', function()
feed('<C-R>r')
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::哦哦哦哦哦哦哦哦}{17:^ }{16: }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :哦哦哦哦哦哦哦哦{2:^ } |
{3:-- TERMINAL --} |
]])
eq({6, 25}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::哦哦哦哦哦哦哦^哦}{1: }{16: }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :哦哦哦哦哦哦哦^哦{4: } |
|
]])
eq({6, 22}, eval('nvim_win_get_cursor(0)'))
@@ -405,17 +405,17 @@ describe('buffer cursor position is correct in terminal without number column',
it('near the end', function()
feed('<C-R>r<C-X><C-X>')
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::哦哦哦哦哦哦}{17:^哦}{16:哦 }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :哦哦哦哦哦哦{2:^哦}哦 |
{3:-- TERMINAL --} |
]])
eq({6, 19}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::哦哦哦哦哦^哦}{1:哦}{16:哦 }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :哦哦哦哦哦^哦{4:哦}哦 |
|
]])
eq({6, 16}, eval('nvim_win_get_cursor(0)'))
@@ -424,17 +424,17 @@ describe('buffer cursor position is correct in terminal without number column',
it('near the start', function()
feed('<C-R>r<C-B><C-O>')
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::哦}{17:^哦}{16:哦哦哦哦哦哦 }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :哦{2:^哦}哦哦哦哦哦哦 |
{3:-- TERMINAL --} |
]])
eq({6, 4}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::^哦}{1:哦}{16:哦哦哦哦哦哦 }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :^哦{4:哦}哦哦哦哦哦哦 |
|
]])
eq({6, 1}, eval('nvim_win_get_cursor(0)'))
@@ -445,18 +445,18 @@ describe('buffer cursor position is correct in terminal without number column',
setup_ex_register('aaaaaaaa ')
feed('<C-R>r')
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::aaaaaaaa }{17:^ }{16: }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :aaaaaaaa {2:^ } |
{3:-- TERMINAL --} |
]])
matches('^:aaaaaaaa [ ]*$', eval('nvim_get_current_line()'))
eq({6, 13}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {16: }|*4
- {16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {16::aaaaaaaa ^ }{1: }{16: }|
+ |*4
+ Entering Ex mode. Type "visual" to go to Normal mode. |
+ :aaaaaaaa ^ {4: } |
|
]])
eq({6, 12}, eval('nvim_win_get_cursor(0)'))
@@ -481,21 +481,21 @@ describe('buffer cursor position is correct in terminal with number column', fun
})
screen:set_default_attr_ids({
[1] = {foreground = 253, background = 11};
+ [2] = {reverse = true};
[3] = {bold = true},
+ [4] = {background = 11};
[7] = {foreground = 130};
- [16] = {background = 234, foreground = 253};
- [17] = {reverse = true, background = 234, foreground = 253};
})
-- Also check for real cursor position, as it is used for stuff like input methods
screen._handle_busy_start = function() end
screen._handle_busy_stop = function() end
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::}{17:^ }{16: }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:{2:^ } |
{3:-- TERMINAL --} |
]])
end
@@ -513,23 +513,23 @@ describe('buffer cursor position is correct in terminal with number column', fun
it('at the end', function()
feed('<C-R>r')
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::aaaaaaaa}{17:^ }{16: }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:aaaaaaaa{2:^ } |
{3:-- TERMINAL --} |
]])
eq({6, 9}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::aaaaaaa^a}{1: }{16: }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:aaaaaaa^a{4: } |
|
]])
eq({6, 8}, eval('nvim_win_get_cursor(0)'))
@@ -538,23 +538,23 @@ describe('buffer cursor position is correct in terminal with number column', fun
it('near the end', function()
feed('<C-R>r<C-X><C-X>')
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::aaaaaa}{17:^a}{16:a }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:aaaaaa{2:^a}a |
{3:-- TERMINAL --} |
]])
eq({6, 7}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::aaaaa^a}{1:a}{16:a }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:aaaaa^a{4:a}a |
|
]])
eq({6, 6}, eval('nvim_win_get_cursor(0)'))
@@ -563,23 +563,23 @@ describe('buffer cursor position is correct in terminal with number column', fun
it('near the start', function()
feed('<C-R>r<C-B><C-O>')
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::a}{17:^a}{16:aaaaaa }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:a{2:^a}aaaaaa |
{3:-- TERMINAL --} |
]])
eq({6, 2}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::^a}{1:a}{16:aaaaaa }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:^a{4:a}aaaaaa |
|
]])
eq({6, 1}, eval('nvim_win_get_cursor(0)'))
@@ -594,23 +594,23 @@ describe('buffer cursor position is correct in terminal with number column', fun
it('at the end', function()
feed('<C-R>r')
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::µµµµµµµµ}{17:^ }{16: }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:µµµµµµµµ{2:^ } |
{3:-- TERMINAL --} |
]])
eq({6, 17}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::µµµµµµµ^µ}{1: }{16: }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:µµµµµµµ^µ{4: } |
|
]])
eq({6, 15}, eval('nvim_win_get_cursor(0)'))
@@ -619,23 +619,23 @@ describe('buffer cursor position is correct in terminal with number column', fun
it('near the end', function()
feed('<C-R>r<C-X><C-X>')
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::µµµµµµ}{17:^µ}{16:µ }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:µµµµµµ{2:^µ}µ |
{3:-- TERMINAL --} |
]])
eq({6, 13}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::µµµµµ^µ}{1:µ}{16:µ }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:µµµµµ^µ{4:µ}µ |
|
]])
eq({6, 11}, eval('nvim_win_get_cursor(0)'))
@@ -644,23 +644,23 @@ describe('buffer cursor position is correct in terminal with number column', fun
it('near the start', function()
feed('<C-R>r<C-B><C-O>')
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::µ}{17:^µ}{16:µµµµµµ }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:µ{2:^µ}µµµµµµ |
{3:-- TERMINAL --} |
]])
eq({6, 3}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::^µ}{1:µ}{16:µµµµµµ }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:^µ{4:µ}µµµµµµ |
|
]])
eq({6, 1}, eval('nvim_win_get_cursor(0)'))
@@ -677,23 +677,23 @@ describe('buffer cursor position is correct in terminal with number column', fun
it('at the end', function()
feed('<C-R>r')
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::µ̳µ̳µ̳µ̳µ̳µ̳µ̳µ̳}{17:^ }{16: }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:µ̳µ̳µ̳µ̳µ̳µ̳µ̳µ̳{2:^ } |
{3:-- TERMINAL --} |
]])
eq({6, 33}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::µ̳µ̳µ̳µ̳µ̳µ̳µ̳^µ̳}{1: }{16: }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:µ̳µ̳µ̳µ̳µ̳µ̳µ̳^µ̳{4: } |
|
]])
eq({6, 29}, eval('nvim_win_get_cursor(0)'))
@@ -702,23 +702,23 @@ describe('buffer cursor position is correct in terminal with number column', fun
it('near the end', function()
feed('<C-R>r<C-X><C-X>')
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::µ̳µ̳µ̳µ̳µ̳µ̳}{17:^µ̳}{16:µ̳ }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:µ̳µ̳µ̳µ̳µ̳µ̳{2:^µ̳}µ̳ |
{3:-- TERMINAL --} |
]])
eq({6, 25}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::µ̳µ̳µ̳µ̳µ̳^µ̳}{1:µ̳}{16:µ̳ }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:µ̳µ̳µ̳µ̳µ̳^µ̳{4:µ̳}µ̳ |
|
]])
eq({6, 21}, eval('nvim_win_get_cursor(0)'))
@@ -727,23 +727,23 @@ describe('buffer cursor position is correct in terminal with number column', fun
it('near the start', function()
feed('<C-R>r<C-B><C-O>')
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::µ̳}{17:^µ̳}{16:µ̳µ̳µ̳µ̳µ̳µ̳ }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:µ̳{2:^µ̳}µ̳µ̳µ̳µ̳µ̳µ̳ |
{3:-- TERMINAL --} |
]])
eq({6, 5}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::^µ̳}{1:µ̳}{16:µ̳µ̳µ̳µ̳µ̳µ̳ }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:^µ̳{4:µ̳}µ̳µ̳µ̳µ̳µ̳µ̳ |
|
]])
eq({6, 1}, eval('nvim_win_get_cursor(0)'))
@@ -760,23 +760,23 @@ describe('buffer cursor position is correct in terminal with number column', fun
it('at the end', function()
feed('<C-R>r')
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::哦哦哦哦哦哦哦哦}{17:^ }{16: }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:哦哦哦哦哦哦哦哦{2:^ } |
{3:-- TERMINAL --} |
]])
eq({6, 25}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::哦哦哦哦哦哦哦^哦}{1: }{16: }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:哦哦哦哦哦哦哦^哦{4: } |
|
]])
eq({6, 22}, eval('nvim_win_get_cursor(0)'))
@@ -785,23 +785,23 @@ describe('buffer cursor position is correct in terminal with number column', fun
it('near the end', function()
feed('<C-R>r<C-X><C-X>')
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::哦哦哦哦哦哦}{17:^哦}{16:哦 }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:哦哦哦哦哦哦{2:^哦}哦 |
{3:-- TERMINAL --} |
]])
eq({6, 19}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::哦哦哦哦哦^哦}{1:哦}{16:哦 }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:哦哦哦哦哦^哦{4:哦}哦 |
|
]])
eq({6, 16}, eval('nvim_win_get_cursor(0)'))
@@ -810,23 +810,23 @@ describe('buffer cursor position is correct in terminal with number column', fun
it('near the start', function()
feed('<C-R>r<C-B><C-O>')
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::哦}{17:^哦}{16:哦哦哦哦哦哦 }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:哦{2:^哦}哦哦哦哦哦哦 |
{3:-- TERMINAL --} |
]])
eq({6, 4}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::^哦}{1:哦}{16:哦哦哦哦哦哦 }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:^哦{4:哦}哦哦哦哦哦哦 |
|
]])
eq({6, 1}, eval('nvim_win_get_cursor(0)'))
@@ -837,24 +837,24 @@ describe('buffer cursor position is correct in terminal with number column', fun
setup_ex_register('aaaaaaaa ')
feed('<C-R>r')
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::aaaaaaaa }{17:^ }{16: }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:aaaaaaaa {2:^ } |
{3:-- TERMINAL --} |
]])
matches('^:aaaaaaaa [ ]*$', eval('nvim_get_current_line()'))
eq({6, 13}, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
- {7: 1 }{16: }|
- {7: 2 }{16: }|
- {7: 3 }{16: }|
- {7: 4 }{16: }|
- {7: 5 }{16:Entering Ex mode. Type "visual" to go to Normal mode. }|
- {7: 6 }{16::aaaaaaaa ^ }{1: }{16: }|
+ {7: 1 } |
+ {7: 2 } |
+ {7: 3 } |
+ {7: 4 } |
+ {7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
+ {7: 6 }:aaaaaaaa ^ {4: } |
|
]])
eq({6, 12}, eval('nvim_win_get_cursor(0)'))
diff --git a/test/functional/ui/cursor_spec.lua b/test/functional/ui/cursor_spec.lua
index 2b8dc0fe19..7f4d167c41 100644
--- a/test/functional/ui/cursor_spec.lua
+++ b/test/functional/ui/cursor_spec.lua
@@ -213,7 +213,7 @@ describe('ui/cursor', function()
m.hl_id = 64
m.attr = {background = Screen.colors.DarkGray}
end
- if m.id_lm then m.id_lm = 69 end
+ if m.id_lm then m.id_lm = 70 end
end
-- Assert the new expectation.
diff --git a/test/functional/ui/embed_spec.lua b/test/functional/ui/embed_spec.lua
index 072c9e89ce..9d7934a8c6 100644
--- a/test/functional/ui/embed_spec.lua
+++ b/test/functional/ui/embed_spec.lua
@@ -29,9 +29,6 @@ local function test_embed(ext_linegrid)
[6] = {foreground = Screen.colors.NvimDarkGrey3, background = Screen.colors.NvimLightGrey1};
[7] = {foreground = Screen.colors.NvimDarkRed};
[8] = {foreground = Screen.colors.NvimDarkCyan};
- [9] = {foreground = Screen.colors.NvimLightGrey3, background = Screen.colors.NvimDarkGrey1};
- [10] = {foreground = Screen.colors.NvimLightRed};
- [11] = {foreground = Screen.colors.NvimLightCyan};
})
end
@@ -60,11 +57,11 @@ local function test_embed(ext_linegrid)
startup('--cmd', 'echoerr "foo"', '--cmd', 'color default', '--cmd', 'echoerr "bar"')
screen:expect([[
|*3
- {9: }|
+ {6: }|
{7:Error detected while processing pre-vimrc command line:} |
{7:foo} |
- {10:bar} |
- {11:Press ENTER or type command to continue}^ |
+ {7:bar} |
+ {8:Press ENTER or type command to continue}^ |
]])
end)
generated by cgit (git 2.34.1) at 2025-06-14 15:54:31 +0000