diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2019-06-29 21:03:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-29 21:03:38 +0200 |
commit | 2d4a37ebab354afb94dfe600b302d8a2b1f2d889 (patch) | |
tree | fb6c12cef807625b9008487389c3eefd42a8b6af /src | |
parent | c207095445286321cbb319ab1498c34b204760cf (diff) | |
download | rneovim-2d4a37ebab354afb94dfe600b302d8a2b1f2d889.tar.gz rneovim-2d4a37ebab354afb94dfe600b302d8a2b1f2d889.tar.bz2 rneovim-2d4a37ebab354afb94dfe600b302d8a2b1f2d889.zip |
:ls : show "R", "F" for terminal-jobs #10370
This matches Vim behavior. From `:help :ls` :
R a terminal buffer with a running job
F a terminal buffer with a finished job
? a terminal buffer without a job: `:terminal NONE`
TODO: implement `:terminal NONE`.
ref #10349
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/buffer.c | 8 | ||||
-rw-r--r-- | src/nvim/channel.c | 8 | ||||
-rw-r--r-- | src/nvim/event/process.h | 3 |
3 files changed, 15 insertions, 4 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 043ae420cd..5678f518f5 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -29,6 +29,7 @@ #include "nvim/api/vim.h" #include "nvim/ascii.h" #include "nvim/assert.h" +#include "nvim/channel.h" #include "nvim/vim.h" #include "nvim/buffer.h" #include "nvim/charset.h" @@ -2608,9 +2609,10 @@ void buflist_list(exarg_T *eap) const int changed_char = (buf->b_flags & BF_READERR) ? 'x' : (bufIsChanged(buf) ? '+' : ' '); - const int ro_char = !MODIFIABLE(buf) - ? '-' - : (buf->b_p_ro ? '=' : ' '); + 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'; + } msg_putchar('\n'); len = vim_snprintf( diff --git a/src/nvim/channel.c b/src/nvim/channel.c index 3a45a8aec7..104c79efd9 100644 --- a/src/nvim/channel.c +++ b/src/nvim/channel.c @@ -762,6 +762,14 @@ static void set_info_event(void **argv) channel_decref(chan); } +bool channel_job_running(uint64_t id) +{ + Channel *chan = find_channel(id); + return (chan + && chan->streamtype == kChannelStreamProc + && !process_is_stopped(&chan->stream.proc)); +} + Dictionary channel_info(uint64_t id) { Channel *chan = find_channel(id); diff --git a/src/nvim/event/process.h b/src/nvim/event/process.h index ba2c2a6a11..13dc3839ce 100644 --- a/src/nvim/event/process.h +++ b/src/nvim/event/process.h @@ -56,7 +56,8 @@ static inline Process process_init(Loop *loop, ProcessType type, void *data) static inline bool process_is_stopped(Process *proc) { - return proc->stopped_time != 0; + bool exited = (proc->status >= 0); + return exited || (proc->stopped_time != 0); } #ifdef INCLUDE_GENERATED_DECLARATIONS |