mirror of
https://github.com/neovim/neovim.git
synced 2025-10-26 12:27:24 +00:00
74aef89720
Old behaviour: termopen('cmd') would run `&shell &shcf "cmd"`, which
caused the functional tests to fail on some systems due to the process
not "owning" the terminal. Also, it is inconsistent with jobstart().
Modify termopen() so that &shell is not invoked, but maintain the old
behaviour with :terminal. Factor the common code for building the
argument vector from jobstart() and modify the functional tests to call
termopen() instead of :terminal (fixes #2354).
Also:
* Add a 'name' option for termopen() so that `:terminal {cmd}` produces
a buffer named "term//{cwd}/{cmd}" and termopen() users can customize
the name.
* Update the documentation.
* Add functional tests for `:terminal` sinse its behaviour now differs
from termopen(). Add "test/functional/fixtures/shell-test.c" and move
"test/functional/job/tty-test.c" there, too.
Helped-by: Justin M. Keyes <@justinmk>
173 lines
6.5 KiB
Lua
173 lines
6.5 KiB
Lua
local helpers = require('test.functional.helpers')
|
|
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, execute, eq = helpers.nvim_dir, helpers.execute, helpers.eq
|
|
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: } |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-- TERMINAL -- |
|
|
]])
|
|
eq(2, screen._cursor.row)
|
|
eq(15, screen._cursor.col)
|
|
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([[
|
|
1 tty ready |
|
|
2 {2: } |
|
|
3 |
|
|
4 |
|
|
5 |
|
|
6 ^ |
|
|
:set number |
|
|
]])
|
|
end)
|
|
|
|
it('is positioned correctly when focused', function()
|
|
feed('i')
|
|
screen:expect([[
|
|
1 tty ready |
|
|
2 {1: } |
|
|
3 |
|
|
4 |
|
|
5 |
|
|
6 |
|
|
-- TERMINAL -- |
|
|
]])
|
|
end)
|
|
end)
|
|
|
|
describe('when invisible', function()
|
|
it('is not highlighted and is detached from screen cursor', function()
|
|
hide_cursor()
|
|
screen:expect([[
|
|
tty ready |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-- TERMINAL -- |
|
|
]])
|
|
show_cursor()
|
|
screen:expect([[
|
|
tty ready |
|
|
{1: } |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-- 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}
|
|
})
|
|
screen:set_default_attr_ignore({
|
|
[1] = {bold = true},
|
|
[2] = {foreground = 12},
|
|
[3] = {bold = true, reverse = true},
|
|
[5] = {background = 11},
|
|
[6] = {foreground = 130},
|
|
})
|
|
screen:attach(false)
|
|
execute('call termopen(["'..nvim_dir..'/tty-test"]) | startinsert')
|
|
end)
|
|
|
|
it('overrides the default highlighting', function()
|
|
screen:expect([[
|
|
tty ready |
|
|
{1: } |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-- TERMINAL -- |
|
|
]])
|
|
feed('<c-\\><c-n>')
|
|
screen:expect([[
|
|
tty ready |
|
|
{2: } |
|
|
|
|
|
|
|
|
|
|
|
^ |
|
|
|
|
|
]])
|
|
end)
|
|
end)
|
|
|