mirror of
https://github.com/neovim/neovim.git
synced 2024-12-27 14:21:31 -07:00
b63cde97f4
Fixes test failures like
test/functional/terminal/cursor_spec.lua @ 62: terminal cursor with number column is positioned correctly when focused
./test/functional/ui/screen.lua:302: Row 2 did not match.
Expected:
|{7: 1 }tty ready |
|*{7: 2 }{1: } |
|{7: 3 } |
|{7: 4 } |
|{7: 5 } |
|{7: 6 } |
|{3:-- TERMINAL --} |
Actual:
|{7: 1 }tty ready |
|*{7: 2 }rows: 6, cols: 46 |
|{7: 3 }{1: } |
|{7: 4 } |
|{7: 5 } |
|{7: 6 } |
|{3:-- TERMINAL --} |
176 lines
6.9 KiB
Lua
176 lines
6.9 KiB
Lua
local helpers = require('test.functional.helpers')(after_each)
|
|
local Screen = require('test.functional.ui.screen')
|
|
local thelpers = require('test.functional.terminal.helpers')
|
|
local feed, clear, nvim = helpers.feed, helpers.clear, helpers.nvim
|
|
local nvim_dir, command = helpers.nvim_dir, helpers.command
|
|
local feed_command = helpers.feed_command
|
|
local hide_cursor = thelpers.hide_cursor
|
|
local show_cursor = thelpers.show_cursor
|
|
|
|
describe('terminal cursor', function()
|
|
local screen
|
|
|
|
before_each(function()
|
|
clear()
|
|
screen = thelpers.screen_setup()
|
|
end)
|
|
|
|
|
|
it('moves the screen cursor when focused', function()
|
|
thelpers.feed_data('testing cursor')
|
|
screen:expect([[
|
|
tty ready |
|
|
testing cursor{1: } |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{3:-- TERMINAL --} |
|
|
]])
|
|
end)
|
|
|
|
it('is highlighted when not focused', function()
|
|
feed('<c-\\><c-n>')
|
|
screen:expect([[
|
|
tty ready |
|
|
{2:^ } |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
]])
|
|
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([[
|
|
{7: 1 }tty ready |
|
|
{7: 2 }^rows: 6, cols: 46 |
|
|
{7: 3 }{2: } |
|
|
{7: 4 } |
|
|
{7: 5 } |
|
|
{7: 6 } |
|
|
:set number |
|
|
]])
|
|
end)
|
|
|
|
it('is positioned correctly when focused', function()
|
|
screen:expect([[
|
|
{7: 1 }tty ready |
|
|
{7: 2 }^rows: 6, cols: 46 |
|
|
{7: 3 }{2: } |
|
|
{7: 4 } |
|
|
{7: 5 } |
|
|
{7: 6 } |
|
|
:set number |
|
|
]])
|
|
feed('i')
|
|
helpers.wait()
|
|
screen:expect([[
|
|
{7: 1 }tty ready |
|
|
{7: 2 }rows: 6, cols: 46 |
|
|
{7: 3 }{1: } |
|
|
{7: 4 } |
|
|
{7: 5 } |
|
|
{7: 6 } |
|
|
{3:-- TERMINAL --} |
|
|
]])
|
|
end)
|
|
end)
|
|
|
|
describe('when invisible', function()
|
|
it('is not highlighted and is detached from screen cursor', function()
|
|
hide_cursor()
|
|
screen:expect([[
|
|
tty ready |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{3:-- TERMINAL --} |
|
|
]])
|
|
show_cursor()
|
|
screen:expect([[
|
|
tty ready |
|
|
{1: } |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{3:-- TERMINAL --} |
|
|
]])
|
|
-- same for when the terminal is unfocused
|
|
feed('<c-\\><c-n>')
|
|
hide_cursor()
|
|
screen:expect([[
|
|
tty ready |
|
|
^ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
]])
|
|
show_cursor()
|
|
screen:expect([[
|
|
tty ready |
|
|
{2:^ } |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
]])
|
|
end)
|
|
end)
|
|
end)
|
|
|
|
|
|
describe('cursor with customized highlighting', function()
|
|
local screen
|
|
|
|
before_each(function()
|
|
clear()
|
|
nvim('command', 'highlight TermCursor ctermfg=45 ctermbg=46 cterm=NONE')
|
|
nvim('command', 'highlight TermCursorNC ctermfg=55 ctermbg=56 cterm=NONE')
|
|
screen = Screen.new(50, 7)
|
|
screen:set_default_attr_ids({
|
|
[1] = {foreground = 45, background = 46},
|
|
[2] = {foreground = 55, background = 56},
|
|
[3] = {bold = true},
|
|
})
|
|
screen:attach({rgb=false})
|
|
command('call termopen(["'..nvim_dir..'/tty-test"])')
|
|
feed_command('startinsert')
|
|
end)
|
|
|
|
it('overrides the default highlighting', function()
|
|
screen:expect([[
|
|
tty ready |
|
|
{1: } |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{3:-- TERMINAL --} |
|
|
]])
|
|
feed('<c-\\><c-n>')
|
|
screen:expect([[
|
|
tty ready |
|
|
{2:^ } |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
]])
|
|
end)
|
|
end)
|
|
|