mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-08-29 18:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(terminal): free the "[Process exited]" msg extmark #38246

Browse Source 
Problem: Since the "[Process exited]" msg is no longer part of buffer
contents, `jobstart`'s reuse of unmodified finished terminal buffers
does not clear the msg.

Solution: Delete the extmark if `term` is already closed.
This commit is contained in:
Ayaan
2026-03-11 14:43:38 +05:30
committed by GitHub
parent b897e81b30
commit a2f01953b8
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/terminal.c
View File

@@ -209,6 +209,7 @@ struct terminal {
VTermTerminator termrequest_terminator; ///< Terminator (BEL or ST) used in the termrequest VTermTerminator termrequest_terminator; ///< Terminator (BEL or ST) used in the termrequest
size_t refcount; // reference count size_t refcount; // reference count
uint32_t exitmsg_id;
}; };
static VTermScreenCallbacks vterm_screen_callbacks = { static VTermScreenCallbacks vterm_screen_callbacks = {
@@ -672,10 +673,14 @@ void terminal_close(Terminal **termpp, int status)
bool only_destroy = false; bool only_destroy = false;
buf_T *buf = handle_get_buffer(term->buf_handle);
if (term->closed) { if (term->closed) {
// If called from buf_close_terminal() after the process has already exited, we // If called from buf_close_terminal() after the process has already exited, we
// only need to call the close callback to clean up the terminal object. // only need to call the close callback to clean up the terminal object.
only_destroy = true; only_destroy = true;
// Buffer may be reused so delete the "[Process exited]" msg
extmark_del_id(buf, (uint32_t)-1, term->exitmsg_id);
} else { } else {
// flush any pending changes to the buffer // flush any pending changes to the buffer
if (!exiting) { if (!exiting) {
@@ -686,8 +691,6 @@ void terminal_close(Terminal **termpp, int status)
term->closed = true; term->closed = true;
} }
buf_T *buf = handle_get_buffer(term->buf_handle);
if (status == -1 || exiting) { if (status == -1 || exiting) {
// If this was called by buf_close_terminal() (status is -1), or if exiting, we // If this was called by buf_close_terminal() (status is -1), or if exiting, we
// must inform the buffer the terminal no longer exists so that buf_freeall() // must inform the buffer the terminal no longer exists so that buf_freeall()
@@ -729,7 +732,7 @@ void terminal_close(Terminal **termpp, int status)
int pos = MIN(row_to_linenr(term, term->cursor.row), int pos = MIN(row_to_linenr(term, term->cursor.row),
buf->b_ml.ml_line_count - 1); buf->b_ml.ml_line_count - 1);
extmark_set(buf, (uint32_t)-1, NULL, pos, 0, -1, 0, extmark_set(buf, (uint32_t)-1, &term->exitmsg_id, pos, 0, -1, 0,
decor, 0, true, false, true, false, NULL); decor, 0, true, false, true, false, NULL);
// Redraw statusline to show the exit code. // Redraw statusline to show the exit code.

9
test/functional/terminal/buffer_spec.lua
View File

@@ -1313,11 +1313,6 @@ describe(':terminal buffer', function()
[Process exited 0] | [Process exited 0] |
|*5 |*5
]]) ]])
api.nvim_buf_clear_namespace(0, -1, 0, -1)
env.screen:expect([[
^ready $ |
|*6
]])
env.buf = api.nvim_get_current_buf() env.buf = api.nvim_get_current_buf()
api.nvim_set_option_value('modified', false, { buf = env.buf }) api.nvim_set_option_value('modified', false, { buf = env.buf })
end) end)
@@ -1334,10 +1329,10 @@ describe(':terminal buffer', function()
local chan = api.nvim_open_term(0, {}) local chan = api.nvim_open_term(0, {})
api.nvim_chan_send(chan, 'TEST') api.nvim_chan_send(chan, 'TEST')
fn.chanclose(chan) fn.chanclose(chan)
api.nvim_buf_clear_namespace(0, -1, 0, -1)
env.screen:expect([[ env.screen:expect([[
^TEST | ^TEST |
|*6 [Terminal closed] |
|*5
]]) ]])
env.buf = api.nvim_get_current_buf() env.buf = api.nvim_get_current_buf()
api.nvim_set_option_value('modified', false, { buf = env.buf }) api.nvim_set_option_value('modified', false, { buf = env.buf })