mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-07-21 16:41:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(jobs): jobstart(term=true) accepts width/height #33904

Browse Source 
Problem: when create a hidden terminal job with `nvim_buf_call`+
`jobstart(…,{term=true})`, program like `lazygit` cannot figure out the
correct width and height.

Solution: `jobstart(…,{term=true})` accepts `width`/`height`
This commit is contained in:
phanium
2025-10-15 12:42:02 +08:00
committed by GitHub
parent cdc3702f8d
commit eaa9aca130
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/eval/funcs.c
View File

@@ -3595,8 +3595,8 @@ void f_jobstart(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
} }
} }
uint16_t width = 0; uint16_t width = (uint16_t)tv_dict_get_number(job_opts, "width");
uint16_t height = 0; uint16_t height = (uint16_t)tv_dict_get_number(job_opts, "height");
char *term_name = NULL; char *term_name = NULL;
if (term) { if (term) {
@@ -3616,13 +3616,11 @@ void f_jobstart(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
overlapped = false; overlapped = false;
detach = false; detach = false;
stdin_mode = kChannelStdinPipe; stdin_mode = kChannelStdinPipe;
width = (uint16_t)MAX(0, curwin->w_view_width - win_col_off(curwin)); width = width ? width : (uint16_t)MAX(0, curwin->w_view_width - win_col_off(curwin));
height = (uint16_t)curwin->w_view_height; height = height ? height : (uint16_t)curwin->w_view_height;
} }
if (pty) { if (pty) {
width = width ? width : (uint16_t)tv_dict_get_number(job_opts, "width");
height = height ? height : (uint16_t)tv_dict_get_number(job_opts, "height");
// Deprecated TERM field is from before `env` option existed. // Deprecated TERM field is from before `env` option existed.
term_name = term_name ? term_name : tv_dict_get_string(job_opts, "TERM", false); term_name = term_name ? term_name : tv_dict_get_string(job_opts, "TERM", false);
term_name = term_name ? term_name : "ansi"; term_name = term_name ? term_name : "ansi";

22
test/functional/core/job_spec.lua
View File

@@ -97,6 +97,28 @@ describe('jobs', function()
command("call jobstart(['cat', '-'], { 'term': v:false })") command("call jobstart(['cat', '-'], { 'term': v:false })")
end) end)
it('jobstart(term=true) accepts width/height (#33904)', function()
local buf = api.nvim_create_buf(false, true)
exec_lua(function()
vim.api.nvim_buf_call(buf, function()
vim.fn.jobstart({
vim.v.progpath,
'--clean',
'--headless',
'+lua print(vim.uv.new_tty(1, false):get_winsize())',
}, {
term = true,
width = 11,
height = 12,
env = { VIMRUNTIME = os.getenv('VIMRUNTIME') },
})
end)
end)
retry(nil, nil, function()
eq({ '11 12' }, api.nvim_buf_get_lines(buf, 0, 1, false))
end)
end)
it('must specify env option as a dict', function() it('must specify env option as a dict', function()
command('let g:job_opts.env = v:true') command('let g:job_opts.env = v:true')
local _, err = pcall(function() local _, err = pcall(function()