alex/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-02-21 09:50:19 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix(:ls): check for finished terminal properly (#37303)

Browse Source 
Use terminal_running() instead of channel_job_running().

(cherry picked from commit 49d7f694a8)
This commit is contained in:
zeertzjq
2026-01-09 09:31:00 +08:00
committed by github-actions[bot]
parent 9f2b991331
commit 5e7af0ba01
4 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/buffer.c
View File

@@ -2904,7 +2904,7 @@ void buflist_list(exarg_T *eap)
: (bufIsChanged(buf) ? '+' : ' ');
int ro_char = !MODIFIABLE(buf) ? '-' : (buf->b_p_ro ? '=' : ' ');
if (buf->terminal) {
ro_char = channel_job_running((uint64_t)buf->b_p_channel) ? 'R' : 'F';
ro_char = terminal_running(buf->terminal) ? 'R' : 'F';
}
msg_putchar('\n');

2
src/nvim/channel.c
View File

@@ -900,6 +900,8 @@ static void set_info_event(void **argv)
channel_decref(chan);
}
/// Unlike terminal_running(), this returns false immediately after stopping a job.
/// However, this always returns false for nvim_open_term() terminals.
bool channel_job_running(uint64_t id)
{
Channel *chan = find_channel(id);

2
src/nvim/ex_cmds.c
View File

@@ -1889,6 +1889,8 @@ void do_wqall(exarg_T *eap)
FOR_ALL_BUFFERS(buf) {
if (exiting && !eap->forceit
&& buf->terminal
// TODO(zeertzjq): this always returns false for nvim_open_term() terminals.
// Use terminal_running() instead?
&& channel_job_running((uint64_t)buf->b_p_channel)) {
no_write_message_buf(buf);
error++;

32
test/functional/ex_cmds/ls_spec.lua
View File

@@ -15,15 +15,15 @@ describe(':ls', function()
clear()
end)
it('R, F for :terminal buffers', function()
api.nvim_set_option_value('shell', string.format('"%s" INTERACT', testprg('shell-test')), {})
--- @param start_running_term fun()
--- @param start_finished_term fun()
local function test_ls_terminal_buffer(start_running_term, start_finished_term)
command('edit foo')
command('set hidden')
command('terminal')
start_running_term()
command('vsplit')
command('terminal')
feed('iexit<cr>')
start_finished_term()
retry(nil, 5000, function()
local ls_output = eval('execute("ls")')
-- Normal buffer.
@@ -45,5 +45,25 @@ describe(':ls', function()
-- Just the [F]inished terminal buffer.
eq('\n 3 %aF ', string.match(ls_output, '^\n *3 ... '))
end)
end
describe('R, F for', function()
it('terminal buffers', function()
api.nvim_set_option_value('shell', string.format('"%s" INTERACT', testprg('shell-test')), {})
test_ls_terminal_buffer(function()
command('terminal')
end, function()
command('terminal')
feed('iexit<cr>')
end)
end)
it('nvim_open_term() buffers', function()
test_ls_terminal_buffer(function()
command('enew | call nvim_open_term(0, {})')
end, function()
command('enew | call chanclose(nvim_open_term(0, {}))')
end)
end)
end)
end)