1 files changed, 89 insertions, 28 deletions

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 0b1fd6670e..dce2f32707 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -405,7 +405,7 @@ typedef struct {
     LibuvProcess uv;
     PtyProcess pty;
   } proc;
-  Stream in, out, err;
+  Stream in, out, err;  // Initialized in common_job_start().
   Terminal *term;
   bool stopped;
   bool exited;
@@ -6709,7 +6709,6 @@ static int get_env_tv(char_u **arg, typval_T *rettv, int evaluate)
 # include "funcs.generated.h"
 #endif
 
-
 /*
  * Function given to ExpandGeneric() to obtain the list of internal
  * or user defined function names.
@@ -7712,26 +7711,47 @@ static void f_bufnr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
     rettv->vval.v_number = -1;
 }
 
-/*
- * "bufwinnr(nr)" function
- */
-static void f_bufwinnr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+static void buf_win_common(typval_T *argvars, typval_T *rettv, bool get_nr)
 {
-  (void)get_tv_number(&argvars[0]);         /* issue errmsg if type error */
-  ++emsg_off;
+  int error = false;
+  (void)get_tv_number_chk(&argvars[0], &error);  // issue errmsg if type error
+  if (error) {  // the argument has an invalid type
+    rettv->vval.v_number = -1;
+    return;
+  }
+
+  emsg_off++;
+  buf_T *buf = get_buf_tv(&argvars[0], true);
+  if (buf == NULL) {  // no need to search if buffer was not found
+    rettv->vval.v_number = -1;
+    goto end;
+  }
 
-  buf_T *buf = get_buf_tv(&argvars[0], TRUE);
   int winnr = 0;
+  int winid;
   bool found_buf = false;
   FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
-    ++winnr;
+    winnr++;
     if (wp->w_buffer == buf) {
       found_buf = true;
+      winid = wp->handle;
       break;
     }
   }
-  rettv->vval.v_number = (found_buf ? winnr : -1);
-  --emsg_off;
+  rettv->vval.v_number = (found_buf ? (get_nr ? winnr : winid) : -1);
+end:
+  emsg_off--;
+}
+
+/// "bufwinid(nr)" function
+static void f_bufwinid(typval_T *argvars, typval_T *rettv, FunPtr fptr) {
+  buf_win_common(argvars, rettv, false);
+}
+
+/// "bufwinnr(nr)" function
+static void f_bufwinnr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  buf_win_common(argvars, rettv, true);
 }
 
 /*
@@ -9507,24 +9527,35 @@ static void f_getchar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   varnumber_T n;
   int error = FALSE;
 
-  /* Position the cursor.  Needed after a message that ends in a space. */
-  ui_cursor_goto(msg_row, msg_col);
-
   ++no_mapping;
   ++allow_keys;
   for (;; ) {
-    if (argvars[0].v_type == VAR_UNKNOWN)
-      /* getchar(): blocking wait. */
+    // Position the cursor.  Needed after a message that ends in a space,
+    // or if event processing caused a redraw.
+    ui_cursor_goto(msg_row, msg_col);
+
+    if (argvars[0].v_type == VAR_UNKNOWN) {
+      // getchar(): blocking wait.
+      if (!(char_avail() || using_script() || input_available())) {
+        input_enable_events();
+        (void)os_inchar(NULL, 0, -1, 0);
+        input_disable_events();
+        if (!multiqueue_empty(main_loop.events)) {
+          multiqueue_process_events(main_loop.events);
+          continue;
+        }
+      }
       n = safe_vgetc();
-    else if (get_tv_number_chk(&argvars[0], &error) == 1)
-      /* getchar(1): only check if char avail */
+    } else if (get_tv_number_chk(&argvars[0], &error) == 1) {
+      // getchar(1): only check if char avail
       n = vpeekc_any();
-    else if (error || vpeekc_any() == NUL)
-      /* illegal argument or getchar(0) and no char avail: return zero */
+    } else if (error || vpeekc_any() == NUL) {
+      // illegal argument or getchar(0) and no char avail: return zero
       n = 0;
-    else
-      /* getchar(0) and char avail: return char */
+    } else {
+      // getchar(0) and char avail: return char
       n = safe_vgetc();
+    }
 
     if (n == K_IGNORE)
       continue;
@@ -9648,13 +9679,23 @@ static void f_getcompletion(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u        *pat;
   expand_T      xpc;
+  bool          filtered = false;
   int           options = WILD_SILENT | WILD_USE_NL | WILD_ADD_SLASH
           | WILD_NO_BEEP;
 
+  if (argvars[2].v_type != VAR_UNKNOWN) {
+    filtered = get_tv_number_chk(&argvars[2], NULL);
+  }
+
   if (p_wic) {
     options |= WILD_ICASE;
   }
 
+  // For filtered results, 'wildignore' is used
+  if (!filtered) {
+    options |= WILD_KEEP_ALL;
+  }
+
   ExpandInit(&xpc);
   xpc.xp_pattern = get_tv_string(&argvars[0]);
   xpc.xp_pattern_len = STRLEN(xpc.xp_pattern);
@@ -9673,6 +9714,16 @@ static void f_getcompletion(typval_T *argvars, typval_T *rettv, FunPtr fptr)
     xpc.xp_pattern_len = STRLEN(xpc.xp_pattern);
   }
 
+  if (xpc.xp_context == EXPAND_CSCOPE) {
+    set_context_in_cscope_cmd(&xpc, xpc.xp_pattern, CMD_cscope);
+    xpc.xp_pattern_len = STRLEN(xpc.xp_pattern);
+  }
+
+  if (xpc.xp_context == EXPAND_SIGN) {
+    set_context_in_sign_cmd(&xpc, xpc.xp_pattern);
+    xpc.xp_pattern_len = STRLEN(xpc.xp_pattern);
+  }
+
   pat = addstar(xpc.xp_pattern, xpc.xp_pattern_len, xpc.xp_context);
   rettv_list_alloc(rettv);
   if (pat != NULL) {
@@ -10259,7 +10310,11 @@ find_win_by_nr (
   }
 
   FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
-    if (--nr <= 0) {
+    if (nr >= LOWEST_WIN_ID) {
+      if (wp->handle == nr) {
+        return wp;
+      }
+    } else if (--nr <= 0) {
       return wp;
     }
   }
@@ -21739,7 +21794,7 @@ static inline TerminalJobData *common_job_init(char **argv,
   if (!pty) {
     proc->err = &data->err;
   }
-  proc->cb = on_process_exit;
+  proc->cb = eval_job_process_exit_cb;
   proc->events = data->events;
   proc->detach = detach;
   proc->cwd = cwd;
@@ -21923,7 +21978,7 @@ static void on_job_output(Stream *stream, TerminalJobData *data, RBuffer *buf,
   rbuffer_consumed(buf, count);
 }
 
-static void on_process_exit(Process *proc, int status, void *d)
+static void eval_job_process_exit_cb(Process *proc, int status, void *d)
 {
   TerminalJobData *data = d;
   if (data->term && !data->exited) {
@@ -21947,9 +22002,15 @@ static void on_process_exit(Process *proc, int status, void *d)
 
 static void term_write(char *buf, size_t size, void *d)
 {
-  TerminalJobData *data = d;
+  TerminalJobData *job = d;
+  if (job->in.closed) {
+    // If the backing stream was closed abruptly, there may be write events
+    // ahead of the terminal close event. Just ignore the writes.
+    ILOG("write failed: stream is closed");
+    return;
+  }
   WBuffer *wbuf = wstream_new_buffer(xmemdup(buf, size), size, 1, xfree);
-  wstream_write(&data->in, wbuf);
+  wstream_write(&job->in, wbuf);
 }
 
 static void term_resize(uint16_t width, uint16_t height, void *d)