IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

terminal: Account for number column (#5310)

Browse Source
This commit is contained in:
Sam Wilson 2017-10-25 11:18:47 -04:00
parent f0c2f82e90
commit b8a67551d8
5 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/buffer.c
View File

@ -1466,7 +1466,7 @@ void enter_buffer(buf_T *buf)
if (buf->terminal) {
terminal_resize(buf->terminal,
(uint16_t)curwin->w_width,
(uint16_t)(MAX(0, curwin->w_width - win_col_off(curwin))),
(uint16_t)curwin->w_height);
}

5
src/nvim/eval.c
View File

@ -16723,9 +16723,10 @@ static void f_termopen(typval_T *argvars, typval_T *rettv, FunPtr fptr)
}
}
uint16_t term_width = MAX(0, curwin->w_width - win_col_off(curwin));
TerminalJobData *data = common_job_init(argv, on_stdout, on_stderr, on_exit,
true, false, false, cwd);
data->proc.pty.width = curwin->w_width;
data->proc.pty.width = term_width;
data->proc.pty.height = curwin->w_height;
data->proc.pty.term_name = xstrdup("xterm-256color");
if (!common_job_start(data, rettv)) {
@ -16733,7 +16734,7 @@ static void f_termopen(typval_T *argvars, typval_T *rettv, FunPtr fptr)
}
TerminalOptions topts;
topts.data = data;
topts.width = curwin->w_width;
topts.width = term_width;
topts.height = curwin->w_height;
topts.write_cb = term_write;
topts.resize_cb = term_resize;

6
src/nvim/screen.c
View File

@ -692,6 +692,12 @@ static void win_update(win_T *wp)
if (wp->w_nrwidth != i) {
type = NOT_VALID;
wp->w_nrwidth = i;
if (buf->terminal) {
terminal_resize(buf->terminal,
(uint16_t)(MAX(0, curwin->w_width - win_col_off(curwin))),
(uint16_t)curwin->w_height);
}
} else if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) {
/*
* When there are both inserted/deleted lines and specific lines to be

8
src/nvim/window.c
View File

@ -3747,7 +3747,9 @@ static void win_enter_ext(win_T *wp, bool undo_sync, int curwin_invalid,
do_autochdir();
if (curbuf->terminal) {
terminal_resize(curbuf->terminal, curwin->w_width, curwin->w_height);
terminal_resize(curbuf->terminal,
(uint16_t)(MAX(0, curwin->w_width - win_col_off(curwin))),
(uint16_t)curwin->w_height);
}
}
@ -4946,7 +4948,9 @@ void win_new_width(win_T *wp, int width)
if (wp->w_buffer->terminal) {
if (wp->w_height != 0) {
terminal_resize(wp->w_buffer->terminal, wp->w_width, 0);
terminal_resize(wp->w_buffer->terminal,
(uint16_t)(MAX(0, curwin->w_width - win_col_off(curwin))),
0);
}
}
}

28
test/functional/terminal/window_spec.lua
View File

@ -11,6 +11,34 @@ describe('terminal window', function()
screen = thelpers.screen_setup()
end)
describe('with number set', function()
before_each(function()
feed('<c-\\><c-n>:set number<cr>i')
screen:expect([[
{7: 1 }tty ready |
{7: 2 }rows: 6, cols: 46 |
{7: 3 }{1: } |
{7: 4 } |
{7: 5 } |
{7: 6 } |
{3:-- TERMINAL --} |
]])
end)
it('wraps text correctly', function()
thelpers.feed_data({'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'})
screen:expect([[
{7: 1 }tty ready |
{7: 2 }rows: 6, cols: 46 |
{7: 3 }abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRST|
{7: 4 }UVWXYZ{1: } |
{7: 5 } |
{7: 6 } |
{3:-- TERMINAL --} |
]])
end)
end)
describe('with colorcolumn set', function()
before_each(function()
feed('<c-\\><c-n>')