2024-04-20 08:44:13 -07:00
|
|
|
local t = require('test.testutil')
|
|
|
|
local n = require('test.functional.testnvim')()
|
2015-03-25 05:14:47 -07:00
|
|
|
local Screen = require('test.functional.ui.screen')
|
2024-04-08 02:03:20 -07:00
|
|
|
local tt = require('test.functional.terminal.testutil')
|
2024-04-20 08:44:13 -07:00
|
|
|
|
|
|
|
local feed, clear = n.feed, n.clear
|
|
|
|
local testprg, command = n.testprg, n.command
|
|
|
|
local eq, eval = t.eq, n.eval
|
2024-04-08 02:03:20 -07:00
|
|
|
local matches = t.matches
|
2024-04-20 08:44:13 -07:00
|
|
|
local poke_eventloop = n.poke_eventloop
|
2024-04-08 02:03:20 -07:00
|
|
|
local hide_cursor = tt.hide_cursor
|
|
|
|
local show_cursor = tt.show_cursor
|
|
|
|
local is_os = t.is_os
|
|
|
|
local skip = t.skip
|
2015-03-25 05:14:47 -07:00
|
|
|
|
2018-04-28 16:39:21 -07:00
|
|
|
describe(':terminal cursor', function()
|
2015-03-25 05:14:47 -07:00
|
|
|
local screen
|
|
|
|
|
|
|
|
before_each(function()
|
|
|
|
clear()
|
2024-04-08 02:03:20 -07:00
|
|
|
screen = tt.screen_setup()
|
2015-03-25 05:14:47 -07:00
|
|
|
end)
|
|
|
|
|
|
|
|
it('moves the screen cursor when focused', function()
|
2024-04-08 02:03:20 -07:00
|
|
|
tt.feed_data('testing cursor')
|
2015-03-25 05:14:47 -07:00
|
|
|
screen:expect([[
|
|
|
|
tty ready |
|
|
|
|
testing cursor{1: } |
|
2023-12-09 05:42:00 -07:00
|
|
|
|*4
|
2016-08-09 08:01:56 -07:00
|
|
|
{3:-- TERMINAL --} |
|
2015-03-25 05:14:47 -07:00
|
|
|
]])
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('is highlighted when not focused', function()
|
|
|
|
feed('<c-\\><c-n>')
|
|
|
|
screen:expect([[
|
|
|
|
tty ready |
|
2017-02-26 19:10:55 -07:00
|
|
|
{2:^ } |
|
2023-12-09 05:42:00 -07:00
|
|
|
|*5
|
2015-03-25 05:14:47 -07:00
|
|
|
]])
|
|
|
|
end)
|
|
|
|
|
|
|
|
describe('with number column', function()
|
|
|
|
before_each(function()
|
|
|
|
feed('<c-\\><c-n>:set number<cr>')
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('is positioned correctly when unfocused', function()
|
|
|
|
screen:expect([[
|
2016-08-09 08:01:56 -07:00
|
|
|
{7: 1 }tty ready |
|
2017-11-12 12:22:35 -07:00
|
|
|
{7: 2 }^rows: 6, cols: 46 |
|
|
|
|
{7: 3 }{2: } |
|
2016-08-09 08:01:56 -07:00
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 } |
|
2017-02-26 19:10:55 -07:00
|
|
|
{7: 6 } |
|
2015-03-25 05:14:47 -07:00
|
|
|
:set number |
|
|
|
|
]])
|
|
|
|
end)
|
|
|
|
|
2017-03-28 17:13:50 -07:00
|
|
|
it('is positioned correctly when focused', function()
|
2017-11-12 12:22:35 -07:00
|
|
|
screen:expect([[
|
|
|
|
{7: 1 }tty ready |
|
|
|
|
{7: 2 }^rows: 6, cols: 46 |
|
|
|
|
{7: 3 }{2: } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 } |
|
|
|
|
{7: 6 } |
|
|
|
|
:set number |
|
|
|
|
]])
|
2015-03-25 05:14:47 -07:00
|
|
|
feed('i')
|
2024-04-20 08:44:13 -07:00
|
|
|
n.poke_eventloop()
|
2015-03-25 05:14:47 -07:00
|
|
|
screen:expect([[
|
2017-03-28 17:13:50 -07:00
|
|
|
{7: 1 }tty ready |
|
2017-11-12 12:22:35 -07:00
|
|
|
{7: 2 }rows: 6, cols: 46 |
|
|
|
|
{7: 3 }{1: } |
|
2017-03-28 17:13:50 -07:00
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 } |
|
|
|
|
{7: 6 } |
|
|
|
|
{3:-- TERMINAL --} |
|
2015-03-25 05:14:47 -07:00
|
|
|
]])
|
|
|
|
end)
|
|
|
|
end)
|
|
|
|
|
|
|
|
describe('when invisible', function()
|
|
|
|
it('is not highlighted and is detached from screen cursor', function()
|
2022-11-21 17:13:30 -07:00
|
|
|
skip(is_os('win'))
|
2015-03-25 05:14:47 -07:00
|
|
|
hide_cursor()
|
|
|
|
screen:expect([[
|
|
|
|
tty ready |
|
2023-12-09 05:42:00 -07:00
|
|
|
|*5
|
2016-08-09 08:01:56 -07:00
|
|
|
{3:-- TERMINAL --} |
|
2015-03-25 05:14:47 -07:00
|
|
|
]])
|
|
|
|
show_cursor()
|
|
|
|
screen:expect([[
|
|
|
|
tty ready |
|
|
|
|
{1: } |
|
2023-12-09 05:42:00 -07:00
|
|
|
|*4
|
2016-08-09 08:01:56 -07:00
|
|
|
{3:-- TERMINAL --} |
|
2015-03-25 05:14:47 -07:00
|
|
|
]])
|
|
|
|
-- same for when the terminal is unfocused
|
|
|
|
feed('<c-\\><c-n>')
|
|
|
|
hide_cursor()
|
|
|
|
screen:expect([[
|
|
|
|
tty ready |
|
2017-02-26 19:10:55 -07:00
|
|
|
^ |
|
2023-12-09 05:42:00 -07:00
|
|
|
|*5
|
2015-03-25 05:14:47 -07:00
|
|
|
]])
|
|
|
|
show_cursor()
|
|
|
|
screen:expect([[
|
|
|
|
tty ready |
|
2017-02-26 19:10:55 -07:00
|
|
|
{2:^ } |
|
2023-12-09 05:42:00 -07:00
|
|
|
|*5
|
2015-03-25 05:14:47 -07:00
|
|
|
]])
|
|
|
|
end)
|
|
|
|
end)
|
|
|
|
end)
|
|
|
|
|
|
|
|
describe('cursor with customized highlighting', function()
|
|
|
|
local screen
|
|
|
|
|
|
|
|
before_each(function()
|
|
|
|
clear()
|
2024-01-12 06:11:28 -07:00
|
|
|
command('highlight TermCursor ctermfg=45 ctermbg=46 cterm=NONE')
|
|
|
|
command('highlight TermCursorNC ctermfg=55 ctermbg=56 cterm=NONE')
|
2015-03-25 05:14:47 -07:00
|
|
|
screen = Screen.new(50, 7)
|
|
|
|
screen:set_default_attr_ids({
|
|
|
|
[1] = { foreground = 45, background = 46 },
|
2016-08-09 08:01:56 -07:00
|
|
|
[2] = { foreground = 55, background = 56 },
|
|
|
|
[3] = { bold = true },
|
2015-03-25 05:14:47 -07:00
|
|
|
})
|
2016-06-08 02:26:06 -07:00
|
|
|
screen:attach({ rgb = false })
|
2022-06-22 05:51:52 -07:00
|
|
|
command('call termopen(["' .. testprg('tty-test') .. '"])')
|
2023-07-22 21:46:56 -07:00
|
|
|
feed('i')
|
|
|
|
poke_eventloop()
|
2015-03-25 05:14:47 -07:00
|
|
|
end)
|
|
|
|
|
|
|
|
it('overrides the default highlighting', function()
|
|
|
|
screen:expect([[
|
|
|
|
tty ready |
|
|
|
|
{1: } |
|
2023-12-09 05:42:00 -07:00
|
|
|
|*4
|
2016-08-09 08:01:56 -07:00
|
|
|
{3:-- TERMINAL --} |
|
2015-03-25 05:14:47 -07:00
|
|
|
]])
|
|
|
|
feed('<c-\\><c-n>')
|
|
|
|
screen:expect([[
|
|
|
|
tty ready |
|
2017-02-26 19:10:55 -07:00
|
|
|
{2:^ } |
|
2023-12-09 05:42:00 -07:00
|
|
|
|*5
|
2015-03-25 05:14:47 -07:00
|
|
|
]])
|
|
|
|
end)
|
|
|
|
end)
|
|
|
|
|
2021-12-07 17:11:27 -07:00
|
|
|
describe('buffer cursor position is correct in terminal without number column', function()
|
|
|
|
local screen
|
|
|
|
|
|
|
|
local function setup_ex_register(str)
|
2024-04-08 02:03:20 -07:00
|
|
|
screen = tt.setup_child_nvim({
|
2023-12-05 15:26:46 -07:00
|
|
|
'-u',
|
|
|
|
'NONE',
|
|
|
|
'-i',
|
|
|
|
'NONE',
|
|
|
|
'-E',
|
|
|
|
'--cmd',
|
|
|
|
string.format('let @r = "%s"', str),
|
2021-12-07 17:11:27 -07:00
|
|
|
-- <Left> and <Right> don't always work
|
2023-12-05 15:26:46 -07:00
|
|
|
'--cmd',
|
|
|
|
'cnoremap <C-X> <Left>',
|
|
|
|
'--cmd',
|
|
|
|
'cnoremap <C-O> <Right>',
|
|
|
|
'--cmd',
|
|
|
|
'set notermguicolors',
|
|
|
|
}, {
|
|
|
|
cols = 70,
|
|
|
|
})
|
feat(highlight): update default color scheme
Problem: Default color scheme is suboptimal.
Solution: Start using new color scheme. Introduce new `vim` color scheme
for opt-in backward compatibility.
------
Main design ideas
- Be "Neovim branded".
- Be minimal for 256 colors with a bit more shades for true colors.
- Be accessible through high enough contrast ratios.
- Be suitable for dark and light backgrounds via exchange of dark and
light palettes.
------
Palettes
- Have dark and light variants. Implemented through exporeted
`NvimDark*` and `NvimLight*` hex colors.
- Palettes have 4 shades of grey for UI elements and 6 colors (red,
yellow, green, cyan, blue, magenta).
- Actual values are computed procedurally in Oklch color space based on
a handful of hyperparameters.
- Each color has a 256 colors variant with perceptually closest color.
------
Highlight groups
Use:
- Grey shades for general UI according to their design.
- Bold text for keywords (`Statement` highlight group). This is an
important choice to increase accessibility for people with color
deficiencies, as it doesn't rely on actual color.
- Green for strings, `DiffAdd` (as background), `DiagnosticOk`, and some
minor text UI elements.
- Cyan as main syntax color, i.e. for function usage (`Function`
highlight group), `DiffText`, `DiagnosticInfo`, and some minor text UI
elements.
- Red to generally mean high user attention, i.e. errors; in particular
for `ErrorMsg`, `DiffDelete`, `DiagnosticError`.
- Yellow very sparingly only with true colors to mean mild user
attention, i.e. warnings. That is, `DiagnosticWarn` and `WarningMsg`.
- Blue very sparingly only with true colors as `DiagnosticHint` and some
additional important syntax group (like `Identifier`).
- Magenta very carefully (if at all).
------
Notes
- To make tests work without relatively larege updates, each one is
prepended with an equivalent of the call `:colorscheme vim`.
Plus some tests which spawn new Neovim instances also now use 'vim'
color scheme.
In some cases tests are updated to fit new default color scheme.
2023-11-29 13:16:09 -07:00
|
|
|
screen:set_default_attr_ids({
|
|
|
|
[1] = { foreground = 253, background = 11 },
|
2023-12-12 09:07:45 -07:00
|
|
|
[2] = { reverse = true },
|
feat(highlight): update default color scheme
Problem: Default color scheme is suboptimal.
Solution: Start using new color scheme. Introduce new `vim` color scheme
for opt-in backward compatibility.
------
Main design ideas
- Be "Neovim branded".
- Be minimal for 256 colors with a bit more shades for true colors.
- Be accessible through high enough contrast ratios.
- Be suitable for dark and light backgrounds via exchange of dark and
light palettes.
------
Palettes
- Have dark and light variants. Implemented through exporeted
`NvimDark*` and `NvimLight*` hex colors.
- Palettes have 4 shades of grey for UI elements and 6 colors (red,
yellow, green, cyan, blue, magenta).
- Actual values are computed procedurally in Oklch color space based on
a handful of hyperparameters.
- Each color has a 256 colors variant with perceptually closest color.
------
Highlight groups
Use:
- Grey shades for general UI according to their design.
- Bold text for keywords (`Statement` highlight group). This is an
important choice to increase accessibility for people with color
deficiencies, as it doesn't rely on actual color.
- Green for strings, `DiffAdd` (as background), `DiagnosticOk`, and some
minor text UI elements.
- Cyan as main syntax color, i.e. for function usage (`Function`
highlight group), `DiffText`, `DiagnosticInfo`, and some minor text UI
elements.
- Red to generally mean high user attention, i.e. errors; in particular
for `ErrorMsg`, `DiffDelete`, `DiagnosticError`.
- Yellow very sparingly only with true colors to mean mild user
attention, i.e. warnings. That is, `DiagnosticWarn` and `WarningMsg`.
- Blue very sparingly only with true colors as `DiagnosticHint` and some
additional important syntax group (like `Identifier`).
- Magenta very carefully (if at all).
------
Notes
- To make tests work without relatively larege updates, each one is
prepended with an equivalent of the call `:colorscheme vim`.
Plus some tests which spawn new Neovim instances also now use 'vim'
color scheme.
In some cases tests are updated to fit new default color scheme.
2023-11-29 13:16:09 -07:00
|
|
|
[3] = { bold = true },
|
2023-12-12 09:07:45 -07:00
|
|
|
[4] = { background = 11 },
|
feat(highlight): update default color scheme
Problem: Default color scheme is suboptimal.
Solution: Start using new color scheme. Introduce new `vim` color scheme
for opt-in backward compatibility.
------
Main design ideas
- Be "Neovim branded".
- Be minimal for 256 colors with a bit more shades for true colors.
- Be accessible through high enough contrast ratios.
- Be suitable for dark and light backgrounds via exchange of dark and
light palettes.
------
Palettes
- Have dark and light variants. Implemented through exporeted
`NvimDark*` and `NvimLight*` hex colors.
- Palettes have 4 shades of grey for UI elements and 6 colors (red,
yellow, green, cyan, blue, magenta).
- Actual values are computed procedurally in Oklch color space based on
a handful of hyperparameters.
- Each color has a 256 colors variant with perceptually closest color.
------
Highlight groups
Use:
- Grey shades for general UI according to their design.
- Bold text for keywords (`Statement` highlight group). This is an
important choice to increase accessibility for people with color
deficiencies, as it doesn't rely on actual color.
- Green for strings, `DiffAdd` (as background), `DiagnosticOk`, and some
minor text UI elements.
- Cyan as main syntax color, i.e. for function usage (`Function`
highlight group), `DiffText`, `DiagnosticInfo`, and some minor text UI
elements.
- Red to generally mean high user attention, i.e. errors; in particular
for `ErrorMsg`, `DiffDelete`, `DiagnosticError`.
- Yellow very sparingly only with true colors to mean mild user
attention, i.e. warnings. That is, `DiagnosticWarn` and `WarningMsg`.
- Blue very sparingly only with true colors as `DiagnosticHint` and some
additional important syntax group (like `Identifier`).
- Magenta very carefully (if at all).
------
Notes
- To make tests work without relatively larege updates, each one is
prepended with an equivalent of the call `:colorscheme vim`.
Plus some tests which spawn new Neovim instances also now use 'vim'
color scheme.
In some cases tests are updated to fit new default color scheme.
2023-11-29 13:16:09 -07:00
|
|
|
})
|
2023-07-22 17:23:07 -07:00
|
|
|
-- 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
|
2021-12-07 17:11:27 -07:00
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:{2:^ } |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
end
|
|
|
|
|
|
|
|
before_each(clear)
|
|
|
|
|
2024-03-19 00:42:55 -07:00
|
|
|
describe('in a line with no multibyte chars or trailing spaces,', function()
|
2021-12-07 17:11:27 -07:00
|
|
|
before_each(function()
|
|
|
|
setup_ex_register('aaaaaaaa')
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('at the end', function()
|
|
|
|
feed('<C-R>r')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:aaaaaaaa{2:^ } |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
eq({ 6, 9 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:aaaaaaa^a{4: } |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 8 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('near the end', function()
|
|
|
|
feed('<C-R>r<C-X><C-X>')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:aaaaaa{2:^a}a |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
eq({ 6, 7 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:aaaaa^a{4:a}a |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 6 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('near the start', function()
|
|
|
|
feed('<C-R>r<C-B><C-O>')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:a{2:^a}aaaaaa |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
eq({ 6, 2 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:^a{4:a}aaaaaa |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 1 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
end)
|
|
|
|
|
2024-03-19 00:42:55 -07:00
|
|
|
describe('in a line with single-cell multibyte chars and no trailing spaces,', function()
|
2021-12-07 17:11:27 -07:00
|
|
|
before_each(function()
|
|
|
|
setup_ex_register('µµµµµµµµ')
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('at the end', function()
|
|
|
|
feed('<C-R>r')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:µµµµµµµµ{2:^ } |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
eq({ 6, 17 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:µµµµµµµ^µ{4: } |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 15 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('near the end', function()
|
|
|
|
feed('<C-R>r<C-X><C-X>')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:µµµµµµ{2:^µ}µ |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
eq({ 6, 13 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:µµµµµ^µ{4:µ}µ |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 11 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('near the start', function()
|
|
|
|
feed('<C-R>r<C-B><C-O>')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:µ{2:^µ}µµµµµµ |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
eq({ 6, 3 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:^µ{4:µ}µµµµµµ |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 1 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
end)
|
|
|
|
|
2024-03-19 00:42:55 -07:00
|
|
|
describe('in a line with single-cell composed multibyte chars and no trailing spaces,', function()
|
|
|
|
before_each(function()
|
|
|
|
setup_ex_register('µ̳µ̳µ̳µ̳µ̳µ̳µ̳µ̳')
|
|
|
|
end)
|
2021-12-07 17:11:27 -07:00
|
|
|
|
2024-03-19 00:42:55 -07:00
|
|
|
it('at the end', function()
|
|
|
|
feed('<C-R>r')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:µ̳µ̳µ̳µ̳µ̳µ̳µ̳µ̳{2:^ } |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
2024-03-19 00:42:55 -07:00
|
|
|
eq({ 6, 33 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:µ̳µ̳µ̳µ̳µ̳µ̳µ̳^µ̳{4: } |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
2024-03-19 00:42:55 -07:00
|
|
|
eq({ 6, 29 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
2021-12-07 17:11:27 -07:00
|
|
|
|
2024-03-19 00:42:55 -07:00
|
|
|
it('near the end', function()
|
|
|
|
skip(is_os('win'))
|
|
|
|
feed('<C-R>r<C-X><C-X>')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:µ̳µ̳µ̳µ̳µ̳µ̳{2:^µ̳}µ̳ |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
2024-03-19 00:42:55 -07:00
|
|
|
eq({ 6, 25 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:µ̳µ̳µ̳µ̳µ̳^µ̳{4:µ̳}µ̳ |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
2024-03-19 00:42:55 -07:00
|
|
|
eq({ 6, 21 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
2021-12-07 17:11:27 -07:00
|
|
|
|
2024-03-19 00:42:55 -07:00
|
|
|
it('near the start', function()
|
|
|
|
skip(is_os('win'))
|
|
|
|
feed('<C-R>r<C-B><C-O>')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:µ̳{2:^µ̳}µ̳µ̳µ̳µ̳µ̳µ̳ |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
2024-03-19 00:42:55 -07:00
|
|
|
eq({ 6, 5 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:^µ̳{4:µ̳}µ̳µ̳µ̳µ̳µ̳µ̳ |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
2024-03-19 00:42:55 -07:00
|
|
|
eq({ 6, 1 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
end)
|
2021-12-07 17:11:27 -07:00
|
|
|
|
2024-03-19 00:42:55 -07:00
|
|
|
describe('in a line with double-cell multibyte chars and no trailing spaces,', function()
|
2021-12-07 17:11:27 -07:00
|
|
|
before_each(function()
|
|
|
|
setup_ex_register('哦哦哦哦哦哦哦哦')
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('at the end', function()
|
|
|
|
feed('<C-R>r')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:哦哦哦哦哦哦哦哦{2:^ } |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
eq({ 6, 25 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:哦哦哦哦哦哦哦^哦{4: } |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 22 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('near the end', function()
|
|
|
|
feed('<C-R>r<C-X><C-X>')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:哦哦哦哦哦哦{2:^哦}哦 |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
eq({ 6, 19 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:哦哦哦哦哦^哦{4:哦}哦 |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 16 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('near the start', function()
|
|
|
|
feed('<C-R>r<C-B><C-O>')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:哦{2:^哦}哦哦哦哦哦哦 |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
eq({ 6, 4 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:^哦{4:哦}哦哦哦哦哦哦 |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 1 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
end)
|
2022-05-17 06:09:28 -07:00
|
|
|
|
|
|
|
it('at the end of a line with trailing spaces #16234', function()
|
|
|
|
setup_ex_register('aaaaaaaa ')
|
|
|
|
feed('<C-R>r')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:aaaaaaaa {2:^ } |
|
2022-05-17 06:09:28 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
2022-05-17 21:57:04 -07:00
|
|
|
matches('^:aaaaaaaa [ ]*$', eval('nvim_get_current_line()'))
|
2022-05-17 06:09:28 -07:00
|
|
|
eq({ 6, 13 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
|*4
|
|
|
|
Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
:aaaaaaaa ^ {4: } |
|
2022-05-17 06:09:28 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 12 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
2021-12-07 17:11:27 -07:00
|
|
|
end)
|
|
|
|
|
|
|
|
describe('buffer cursor position is correct in terminal with number column', function()
|
|
|
|
local screen
|
|
|
|
|
|
|
|
local function setup_ex_register(str)
|
2024-04-08 02:03:20 -07:00
|
|
|
screen = tt.setup_child_nvim({
|
2023-12-05 15:26:46 -07:00
|
|
|
'-u',
|
|
|
|
'NONE',
|
|
|
|
'-i',
|
|
|
|
'NONE',
|
|
|
|
'-E',
|
|
|
|
'--cmd',
|
|
|
|
string.format('let @r = "%s"', str),
|
2021-12-07 17:11:27 -07:00
|
|
|
-- <Left> and <Right> don't always work
|
2023-12-05 15:26:46 -07:00
|
|
|
'--cmd',
|
|
|
|
'cnoremap <C-X> <Left>',
|
|
|
|
'--cmd',
|
|
|
|
'cnoremap <C-O> <Right>',
|
|
|
|
'--cmd',
|
|
|
|
'set notermguicolors',
|
|
|
|
}, {
|
|
|
|
cols = 70,
|
|
|
|
})
|
feat(highlight): update default color scheme
Problem: Default color scheme is suboptimal.
Solution: Start using new color scheme. Introduce new `vim` color scheme
for opt-in backward compatibility.
------
Main design ideas
- Be "Neovim branded".
- Be minimal for 256 colors with a bit more shades for true colors.
- Be accessible through high enough contrast ratios.
- Be suitable for dark and light backgrounds via exchange of dark and
light palettes.
------
Palettes
- Have dark and light variants. Implemented through exporeted
`NvimDark*` and `NvimLight*` hex colors.
- Palettes have 4 shades of grey for UI elements and 6 colors (red,
yellow, green, cyan, blue, magenta).
- Actual values are computed procedurally in Oklch color space based on
a handful of hyperparameters.
- Each color has a 256 colors variant with perceptually closest color.
------
Highlight groups
Use:
- Grey shades for general UI according to their design.
- Bold text for keywords (`Statement` highlight group). This is an
important choice to increase accessibility for people with color
deficiencies, as it doesn't rely on actual color.
- Green for strings, `DiffAdd` (as background), `DiagnosticOk`, and some
minor text UI elements.
- Cyan as main syntax color, i.e. for function usage (`Function`
highlight group), `DiffText`, `DiagnosticInfo`, and some minor text UI
elements.
- Red to generally mean high user attention, i.e. errors; in particular
for `ErrorMsg`, `DiffDelete`, `DiagnosticError`.
- Yellow very sparingly only with true colors to mean mild user
attention, i.e. warnings. That is, `DiagnosticWarn` and `WarningMsg`.
- Blue very sparingly only with true colors as `DiagnosticHint` and some
additional important syntax group (like `Identifier`).
- Magenta very carefully (if at all).
------
Notes
- To make tests work without relatively larege updates, each one is
prepended with an equivalent of the call `:colorscheme vim`.
Plus some tests which spawn new Neovim instances also now use 'vim'
color scheme.
In some cases tests are updated to fit new default color scheme.
2023-11-29 13:16:09 -07:00
|
|
|
screen:set_default_attr_ids({
|
|
|
|
[1] = { foreground = 253, background = 11 },
|
2023-12-12 09:07:45 -07:00
|
|
|
[2] = { reverse = true },
|
feat(highlight): update default color scheme
Problem: Default color scheme is suboptimal.
Solution: Start using new color scheme. Introduce new `vim` color scheme
for opt-in backward compatibility.
------
Main design ideas
- Be "Neovim branded".
- Be minimal for 256 colors with a bit more shades for true colors.
- Be accessible through high enough contrast ratios.
- Be suitable for dark and light backgrounds via exchange of dark and
light palettes.
------
Palettes
- Have dark and light variants. Implemented through exporeted
`NvimDark*` and `NvimLight*` hex colors.
- Palettes have 4 shades of grey for UI elements and 6 colors (red,
yellow, green, cyan, blue, magenta).
- Actual values are computed procedurally in Oklch color space based on
a handful of hyperparameters.
- Each color has a 256 colors variant with perceptually closest color.
------
Highlight groups
Use:
- Grey shades for general UI according to their design.
- Bold text for keywords (`Statement` highlight group). This is an
important choice to increase accessibility for people with color
deficiencies, as it doesn't rely on actual color.
- Green for strings, `DiffAdd` (as background), `DiagnosticOk`, and some
minor text UI elements.
- Cyan as main syntax color, i.e. for function usage (`Function`
highlight group), `DiffText`, `DiagnosticInfo`, and some minor text UI
elements.
- Red to generally mean high user attention, i.e. errors; in particular
for `ErrorMsg`, `DiffDelete`, `DiagnosticError`.
- Yellow very sparingly only with true colors to mean mild user
attention, i.e. warnings. That is, `DiagnosticWarn` and `WarningMsg`.
- Blue very sparingly only with true colors as `DiagnosticHint` and some
additional important syntax group (like `Identifier`).
- Magenta very carefully (if at all).
------
Notes
- To make tests work without relatively larege updates, each one is
prepended with an equivalent of the call `:colorscheme vim`.
Plus some tests which spawn new Neovim instances also now use 'vim'
color scheme.
In some cases tests are updated to fit new default color scheme.
2023-11-29 13:16:09 -07:00
|
|
|
[3] = { bold = true },
|
2023-12-12 09:07:45 -07:00
|
|
|
[4] = { background = 11 },
|
feat(highlight): update default color scheme
Problem: Default color scheme is suboptimal.
Solution: Start using new color scheme. Introduce new `vim` color scheme
for opt-in backward compatibility.
------
Main design ideas
- Be "Neovim branded".
- Be minimal for 256 colors with a bit more shades for true colors.
- Be accessible through high enough contrast ratios.
- Be suitable for dark and light backgrounds via exchange of dark and
light palettes.
------
Palettes
- Have dark and light variants. Implemented through exporeted
`NvimDark*` and `NvimLight*` hex colors.
- Palettes have 4 shades of grey for UI elements and 6 colors (red,
yellow, green, cyan, blue, magenta).
- Actual values are computed procedurally in Oklch color space based on
a handful of hyperparameters.
- Each color has a 256 colors variant with perceptually closest color.
------
Highlight groups
Use:
- Grey shades for general UI according to their design.
- Bold text for keywords (`Statement` highlight group). This is an
important choice to increase accessibility for people with color
deficiencies, as it doesn't rely on actual color.
- Green for strings, `DiffAdd` (as background), `DiagnosticOk`, and some
minor text UI elements.
- Cyan as main syntax color, i.e. for function usage (`Function`
highlight group), `DiffText`, `DiagnosticInfo`, and some minor text UI
elements.
- Red to generally mean high user attention, i.e. errors; in particular
for `ErrorMsg`, `DiffDelete`, `DiagnosticError`.
- Yellow very sparingly only with true colors to mean mild user
attention, i.e. warnings. That is, `DiagnosticWarn` and `WarningMsg`.
- Blue very sparingly only with true colors as `DiagnosticHint` and some
additional important syntax group (like `Identifier`).
- Magenta very carefully (if at all).
------
Notes
- To make tests work without relatively larege updates, each one is
prepended with an equivalent of the call `:colorscheme vim`.
Plus some tests which spawn new Neovim instances also now use 'vim'
color scheme.
In some cases tests are updated to fit new default color scheme.
2023-11-29 13:16:09 -07:00
|
|
|
[7] = { foreground = 130 },
|
|
|
|
})
|
2023-07-22 17:23:07 -07:00
|
|
|
-- 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
|
2021-12-07 17:11:27 -07:00
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:{2:^ } |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
end
|
|
|
|
|
|
|
|
before_each(function()
|
|
|
|
clear()
|
|
|
|
command('set number')
|
|
|
|
end)
|
|
|
|
|
2024-03-19 00:42:55 -07:00
|
|
|
describe('in a line with no multibyte chars or trailing spaces,', function()
|
2021-12-07 17:11:27 -07:00
|
|
|
before_each(function()
|
|
|
|
setup_ex_register('aaaaaaaa')
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('at the end', function()
|
|
|
|
feed('<C-R>r')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:aaaaaaaa{2:^ } |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
eq({ 6, 9 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{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: } |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 8 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('near the end', function()
|
|
|
|
feed('<C-R>r<C-X><C-X>')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{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 |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
eq({ 6, 7 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{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 |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 6 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('near the start', function()
|
|
|
|
feed('<C-R>r<C-B><C-O>')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{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 |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
eq({ 6, 2 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{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 |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 1 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
end)
|
|
|
|
|
2024-03-19 00:42:55 -07:00
|
|
|
describe('in a line with single-cell multibyte chars and no trailing spaces,', function()
|
2021-12-07 17:11:27 -07:00
|
|
|
before_each(function()
|
|
|
|
setup_ex_register('µµµµµµµµ')
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('at the end', function()
|
|
|
|
feed('<C-R>r')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:µµµµµµµµ{2:^ } |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
eq({ 6, 17 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:µµµµµµµ^µ{4: } |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 15 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('near the end', function()
|
|
|
|
feed('<C-R>r<C-X><C-X>')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:µµµµµµ{2:^µ}µ |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
eq({ 6, 13 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:µµµµµ^µ{4:µ}µ |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 11 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('near the start', function()
|
|
|
|
feed('<C-R>r<C-B><C-O>')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:µ{2:^µ}µµµµµµ |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
eq({ 6, 3 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:^µ{4:µ}µµµµµµ |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 1 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
end)
|
|
|
|
|
2024-03-19 00:42:55 -07:00
|
|
|
describe('in a line with single-cell composed multibyte chars and no trailing spaces,', function()
|
|
|
|
before_each(function()
|
|
|
|
setup_ex_register('µ̳µ̳µ̳µ̳µ̳µ̳µ̳µ̳')
|
|
|
|
end)
|
2021-12-07 17:11:27 -07:00
|
|
|
|
2024-03-19 00:42:55 -07:00
|
|
|
it('at the end', function()
|
|
|
|
feed('<C-R>r')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:µ̳µ̳µ̳µ̳µ̳µ̳µ̳µ̳{2:^ } |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
2024-03-19 00:42:55 -07:00
|
|
|
eq({ 6, 33 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:µ̳µ̳µ̳µ̳µ̳µ̳µ̳^µ̳{4: } |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
2024-03-19 00:42:55 -07:00
|
|
|
eq({ 6, 29 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
2021-12-07 17:11:27 -07:00
|
|
|
|
2024-03-19 00:42:55 -07:00
|
|
|
it('near the end', function()
|
|
|
|
skip(is_os('win'))
|
|
|
|
feed('<C-R>r<C-X><C-X>')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:µ̳µ̳µ̳µ̳µ̳µ̳{2:^µ̳}µ̳ |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
2024-03-19 00:42:55 -07:00
|
|
|
eq({ 6, 25 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:µ̳µ̳µ̳µ̳µ̳^µ̳{4:µ̳}µ̳ |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
2024-03-19 00:42:55 -07:00
|
|
|
eq({ 6, 21 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
2021-12-07 17:11:27 -07:00
|
|
|
|
2024-03-19 00:42:55 -07:00
|
|
|
it('near the start', function()
|
|
|
|
skip(is_os('win'))
|
|
|
|
feed('<C-R>r<C-B><C-O>')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:µ̳{2:^µ̳}µ̳µ̳µ̳µ̳µ̳µ̳ |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
2024-03-19 00:42:55 -07:00
|
|
|
eq({ 6, 5 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:^µ̳{4:µ̳}µ̳µ̳µ̳µ̳µ̳µ̳ |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
2024-03-19 00:42:55 -07:00
|
|
|
eq({ 6, 1 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
end)
|
2021-12-07 17:11:27 -07:00
|
|
|
|
2024-03-19 00:42:55 -07:00
|
|
|
describe('in a line with double-cell multibyte chars and no trailing spaces,', function()
|
2021-12-07 17:11:27 -07:00
|
|
|
before_each(function()
|
|
|
|
setup_ex_register('哦哦哦哦哦哦哦哦')
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('at the end', function()
|
|
|
|
feed('<C-R>r')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:哦哦哦哦哦哦哦哦{2:^ } |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
eq({ 6, 25 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:哦哦哦哦哦哦哦^哦{4: } |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 22 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('near the end', function()
|
|
|
|
feed('<C-R>r<C-X><C-X>')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:哦哦哦哦哦哦{2:^哦}哦 |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
eq({ 6, 19 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:哦哦哦哦哦^哦{4:哦}哦 |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 16 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('near the start', function()
|
|
|
|
feed('<C-R>r<C-B><C-O>')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:哦{2:^哦}哦哦哦哦哦哦 |
|
2021-12-07 17:11:27 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
|
|
|
eq({ 6, 4 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:^哦{4:哦}哦哦哦哦哦哦 |
|
2021-12-07 17:11:27 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 1 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
|
|
|
end)
|
2022-05-17 06:09:28 -07:00
|
|
|
|
|
|
|
it('at the end of a line with trailing spaces #16234', function()
|
|
|
|
setup_ex_register('aaaaaaaa ')
|
|
|
|
feed('<C-R>r')
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:aaaaaaaa {2:^ } |
|
2022-05-17 06:09:28 -07:00
|
|
|
{3:-- TERMINAL --} |
|
|
|
|
]])
|
2022-05-17 21:57:04 -07:00
|
|
|
matches('^:aaaaaaaa [ ]*$', eval('nvim_get_current_line()'))
|
2022-05-17 06:09:28 -07:00
|
|
|
eq({ 6, 13 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
feed([[<C-\><C-N>]])
|
|
|
|
screen:expect([[
|
2023-12-12 09:07:45 -07:00
|
|
|
{7: 1 } |
|
|
|
|
{7: 2 } |
|
|
|
|
{7: 3 } |
|
|
|
|
{7: 4 } |
|
|
|
|
{7: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
|
|
|
|
{7: 6 }:aaaaaaaa ^ {4: } |
|
2022-05-17 06:09:28 -07:00
|
|
|
|
|
|
|
|
]])
|
|
|
|
eq({ 6, 12 }, eval('nvim_win_get_cursor(0)'))
|
|
|
|
end)
|
2021-12-07 17:11:27 -07:00
|
|
|
end)
|