Merge #10128 from janlazo/vim-8.0.1384

vim-patch:8.0.{1384,1412,1414,1669,1702,1784},8.1.0060

src/nvim/quickfix.c

@@ -3767,10 +3767,6 @@ void ex_cfile(exarg_T *eap)
   qf_info_T   *qi = &ql_info;
   char_u      *au_name = NULL;
 
-  if (eap->cmdidx == CMD_lfile || eap->cmdidx == CMD_lgetfile
-      || eap->cmdidx == CMD_laddfile)
-    wp = curwin;
-
   switch (eap->cmdidx) {
   case CMD_cfile:     au_name = (char_u *)"cfile"; break;
   case CMD_cgetfile:  au_name = (char_u *)"cgetfile"; break;
@@ -3786,6 +3782,13 @@ void ex_cfile(exarg_T *eap)
     set_string_option_direct((char_u *)"ef", -1, eap->arg, OPT_FREE, 0);
 
   char_u *enc = (*curbuf->b_p_menc != NUL) ? curbuf->b_p_menc : p_menc;
+
+  if (eap->cmdidx == CMD_lfile
+      || eap->cmdidx == CMD_lgetfile
+      || eap->cmdidx == CMD_laddfile) {
+    wp = curwin;
+  }
+
   // This function is used by the :cfile, :cgetfile and :caddfile
   // commands.
   // :cfile always creates a new quickfix list and jumps to the
@@ -3820,6 +3823,18 @@ void ex_cfile(exarg_T *eap)
   }
 }
 
+// Return the quickfix/location list number with the given identifier.
+// Returns -1 if list is not found.
+static int qf_id2nr(const qf_info_T *const qi, const unsigned qfid)
+{
+  for (int qf_idx = 0; qf_idx < qi->qf_listcount; qf_idx++) {
+    if (qi->qf_lists[qf_idx].qf_id == qfid) {
+      return qf_idx;
+    }
+  }
+  return -1;
+}
+
 /// Return the vimgrep autocmd name.
 static char_u *vgr_get_auname(cmdidx_T cmdidx)
 {
@@ -3900,32 +3915,25 @@ static buf_T *vgr_load_dummy_buf(char_u *fname, char_u *dirname_start,
 /// Check whether a quickfix/location list is valid. Autocmds may remove or
 /// change a quickfix list when vimgrep is running. If the list is not found,
 /// create a new list.
-static bool vgr_qflist_valid(qf_info_T *qi, unsigned save_qfid,
+static bool vgr_qflist_valid(win_T *wp, qf_info_T *qi, unsigned qfid,
-                             qfline_T *cur_qf_start, int loclist_cmd,
                              char_u *title)
 {
-  if (loclist_cmd) {
+  // Verify that the quickfix/location list was not freed by an autocmd
-    // Verify that the location list is still valid. An autocmd might have
+  if (!qflist_valid(wp, qfid)) {
-    // freed the location list.
+    if (wp != NULL) {
-    if (!qflist_valid(curwin, save_qfid)) {
+      // An autocmd has freed the location list
       EMSG(_(e_loc_list_changed));
       return false;
+    } else {
+      // Quickfix list is not found, create a new one.
+      qf_new_list(qi, title);
+      return true;
     }
   }
-  if (cur_qf_start != qi->qf_lists[qi->qf_curlist].qf_start) {
+  if (qi->qf_lists[qi->qf_curlist].qf_id != qfid) {
-    int idx;
     // Autocommands changed the quickfix list. Find the one we were using
     // and restore it.
-    for (idx = 0; idx < LISTCOUNT; idx++) {
+    qi->qf_curlist = qf_id2nr(qi, qfid);
-      if (cur_qf_start == qi->qf_lists[idx].qf_start) {
-        qi->qf_curlist = idx;
-        break;
-      }
-    }
-    if (idx == LISTCOUNT) {
-      // List cannot be found, create a new one.
-      qf_new_list(qi, title);
-    }
   }
 
   return true;
@@ -4025,9 +4033,7 @@ void ex_vimgrep(exarg_T *eap)
   char_u      *p;
   int fi;
   qf_info_T   *qi = &ql_info;
-  int loclist_cmd = false;
+  win_T *wp = NULL;
-  qfline_T    *cur_qf_start;
-  win_T *wp;
   buf_T       *buf;
   int duplicate_name = FALSE;
   int using_dummy;
@@ -4056,7 +4062,7 @@ void ex_vimgrep(exarg_T *eap)
       || eap->cmdidx == CMD_lgrepadd
       || eap->cmdidx == CMD_lvimgrepadd) {
     qi = ll_get_or_alloc_list(curwin);
-    loclist_cmd = true;
+    wp = curwin;
   }
 
   if (eap->addr_count > 0)
@@ -4106,10 +4112,9 @@ void ex_vimgrep(exarg_T *eap)
    * ":lcd %:p:h" changes the meaning of short path names. */
   os_dirname(dirname_start, MAXPATHL);
 
-  // Remember the current values of the quickfix list and qf_start, so that
+  // Remember the current quickfix list identifier, so that we can check for
-  // we can check for autocommands changing the current quickfix list.
+  // autocommands changing the current quickfix list.
   unsigned save_qfid = qi->qf_lists[qi->qf_curlist].qf_id;
-  cur_qf_start = qi->qf_lists[qi->qf_curlist].qf_start;
 
   seconds = (time_t)0;
   for (fi = 0; fi < fcount && !got_int && tomatch > 0; fi++) {
@@ -4134,12 +4139,13 @@ void ex_vimgrep(exarg_T *eap)
       using_dummy = false;
     }
 
-    // Check whether the quickfix list is still valid
+    // Check whether the quickfix list is still valid. When loading a
-    if (!vgr_qflist_valid(qi, save_qfid, cur_qf_start, loclist_cmd,
+    // buffer above, autocommands might have changed the quickfix list.
-                          *eap->cmdlinep)) {
+    if (!vgr_qflist_valid(wp, qi, save_qfid, *eap->cmdlinep)) {
+      FreeWild(fcount, fnames);
       goto theend;
     }
-    cur_qf_start = qi->qf_lists[qi->qf_curlist].qf_start;
+    save_qfid = qi->qf_lists[qi->qf_curlist].qf_id;
 
     if (buf == NULL) {
       if (!got_int)
@@ -4150,8 +4156,6 @@ void ex_vimgrep(exarg_T *eap)
       found_match = vgr_match_buflines(qi, fname, buf, &regmatch, tomatch,
                                        duplicate_name, flags);
 
-      cur_qf_start = qi->qf_lists[qi->qf_curlist].qf_start;
-
       if (using_dummy) {
         if (found_match && first_match_buf == NULL)
           first_match_buf = buf;
@@ -4222,7 +4226,6 @@ void ex_vimgrep(exarg_T *eap)
 
   // The QuickFixCmdPost autocmd may free the quickfix list. Check the list
   // is still valid.
-  wp = loclist_cmd ? curwin : NULL;
   if (!qflist_valid(wp, save_qfid)) {
     goto theend;
   }
@@ -4543,18 +4546,6 @@ static int qf_get_list_from_lines(dict_T *what, dictitem_T *di, dict_T *retdict)
   return status;
 }
 
-// Return the quickfix/location list number with the given identifier.
-// Returns -1 if list is not found.
-static int qf_id2nr(const qf_info_T *const qi, const unsigned qfid)
-{
-  for (int qf_idx = 0; qf_idx < qi->qf_listcount; qf_idx++) {
-    if (qi->qf_lists[qf_idx].qf_id == qfid) {
-      return qf_idx;
-    }
-  }
-  return -1;
-}
-
 /// Return the quickfix/location list window identifier in the current tabpage.
 static int qf_winid(qf_info_T *qi)
 {
@@ -5166,6 +5157,16 @@ bool set_ref_in_quickfix(int copyID)
         return abort;
       }
     }
+
+    if (IS_LL_WINDOW(win) && (win->w_llist_ref->qf_refcount == 1)) {
+      // In a location list window and none of the other windows is
+      // referring to this location list. Mark the location list
+      // context as still in use.
+      abort = mark_quickfix_ctx(win->w_llist_ref, copyID);
+      if (abort) {
+        return abort;
+      }
+    }
   }
 
   return abort;
@@ -5255,8 +5256,14 @@ void ex_cbuffer(exarg_T *eap)
         qf_list_changed(qi, qi->qf_curlist);
       }
       if (au_name != NULL) {
+        const buf_T *const curbuf_old = curbuf;
         apply_autocmds(EVENT_QUICKFIXCMDPOST, (char_u *)au_name,
                        curbuf->b_fname, true, curbuf);
+        if (curbuf != curbuf_old) {
+          // Autocommands changed buffer, don't jump now, "qi" may
+          // be invalid.
+          res = 0;
+        }
       }
       if (res > 0 && (eap->cmdidx == CMD_cbuffer
                       || eap->cmdidx == CMD_lbuffer)) {

src/nvim/testdir/test_quickfix.vim

@@ -28,7 +28,7 @@ func s:setup_commands(cchar)
     command! -count -nargs=* -bang Xprev <mods><count>cprev<bang> <args>
     command! -nargs=* -bang Xfirst <mods>cfirst<bang> <args>
     command! -nargs=* -bang Xlast <mods>clast<bang> <args>
-    command! -nargs=* -bang Xnfile <mods>cnfile<bang> <args>
+    command! -nargs=* -bang -range Xnfile <mods><count>cnfile<bang> <args>
     command! -nargs=* -bang Xpfile <mods>cpfile<bang> <args>
     command! -nargs=* Xexpr <mods>cexpr <args>
     command! -range -nargs=* Xvimgrep <mods><count>vimgrep <args>
@@ -36,6 +36,7 @@ func s:setup_commands(cchar)
     command! -nargs=* Xgrep <mods> grep <args>
     command! -nargs=* Xgrepadd <mods> grepadd <args>
     command! -nargs=* Xhelpgrep helpgrep <args>
+    command! -nargs=0 -count Xcc <count>cc
     let g:Xgetlist = function('getqflist')
     let g:Xsetlist = function('setqflist')
     call setqflist([], 'f')
@@ -60,7 +61,7 @@ func s:setup_commands(cchar)
     command! -count -nargs=* -bang Xprev <mods><count>lprev<bang> <args>
     command! -nargs=* -bang Xfirst <mods>lfirst<bang> <args>
     command! -nargs=* -bang Xlast <mods>llast<bang> <args>
-    command! -nargs=* -bang Xnfile <mods>lnfile<bang> <args>
+    command! -nargs=* -bang -range Xnfile <mods><count>lnfile<bang> <args>
     command! -nargs=* -bang Xpfile <mods>lpfile<bang> <args>
     command! -nargs=* Xexpr <mods>lexpr <args>
     command! -range -nargs=* Xvimgrep <mods><count>lvimgrep <args>
@@ -68,6 +69,7 @@ func s:setup_commands(cchar)
     command! -nargs=* Xgrep <mods> lgrep <args>
     command! -nargs=* Xgrepadd <mods> lgrepadd <args>
     command! -nargs=* Xhelpgrep lhelpgrep <args>
+    command! -nargs=0 -count Xcc <count>ll
     let g:Xgetlist = function('getloclist', [0])
     let g:Xsetlist = function('setloclist', [0])
     call setloclist(0, [], 'f')
@@ -395,12 +397,18 @@ endfunc
 func Xtest_browse(cchar)
   call s:setup_commands(a:cchar)
 
+  call g:Xsetlist([], 'f')
   " Jumping to first or next location list entry without any error should
   " result in failure
-  if a:cchar == 'l'
+  if a:cchar == 'c'
-      call assert_fails('lfirst', 'E776:')
+    let err = 'E42:'
-      call assert_fails('lnext', 'E776:')
+  else
+    let err = 'E776:'
   endif
+  call assert_fails('Xnext', err)
+  call assert_fails('Xprev', err)
+  call assert_fails('Xnfile', err)
+  call assert_fails('Xpfile', err)
 
   call s:create_test_file('Xqftestfile1')
   call s:create_test_file('Xqftestfile2')
@@ -421,6 +429,12 @@ func Xtest_browse(cchar)
   Xpfile
   call assert_equal('Xqftestfile1', bufname('%'))
   call assert_equal(6, line('.'))
+  5Xcc
+  call assert_equal(5, g:Xgetlist({'idx':0}).idx)
+  2Xcc
+  call assert_equal(2, g:Xgetlist({'idx':0}).idx)
+  10Xcc
+  call assert_equal(6, g:Xgetlist({'idx':0}).idx)
   Xlast
   Xprev
   call assert_equal('Xqftestfile2', bufname('%'))
@@ -438,6 +452,23 @@ func Xtest_browse(cchar)
   call assert_equal('Xqftestfile1', bufname('%'))
   call assert_equal(5, line('.'))
 
+  " Jumping to an error from the error window using cc command
+  Xgetexpr ['Xqftestfile1:5:Line5',
+		\ 'Xqftestfile1:6:Line6',
+		\ 'Xqftestfile2:10:Line10',
+		\ 'Xqftestfile2:11:Line11']
+  Xopen
+  10Xcc
+  call assert_equal(11, line('.'))
+  call assert_equal('Xqftestfile2', bufname('%'))
+
+  " Jumping to an error from the error window (when only the error window is
+  " present)
+  Xopen | only
+  Xlast 1
+  call assert_equal(5, line('.'))
+  call assert_equal('Xqftestfile1', bufname('%'))
+
   Xexpr ""
   call assert_fails('Xnext', 'E42:')
 
@@ -1108,18 +1139,18 @@ func Test_efm2()
 
   " Test for %o
   set efm=%f(%o):%l\ %m
-  cgetexpr ['Xtestfile(Language.PureScript.Types):20 Error']
+  cgetexpr ['Xotestfile(Language.PureScript.Types):20 Error']
-  call writefile(['Line1'], 'Xtestfile')
+  call writefile(['Line1'], 'Xotestfile')
   let l = getqflist()
   call assert_equal(1, len(l), string(l))
   call assert_equal('Language.PureScript.Types', l[0].module)
   copen
   call assert_equal('Language.PureScript.Types|20| Error', getline(1))
   call feedkeys("\<CR>", 'xn')
-  call assert_equal('Xtestfile', expand('%:t'))
+  call assert_equal('Xotestfile', expand('%:t'))
   cclose
   bd
-  call delete("Xtestfile")
+  call delete("Xotestfile")
 
   " The following sequence of commands used to crash Vim
   set efm=%W%m
@@ -1512,13 +1543,18 @@ func Test_switchbuf()
   set switchbuf=usetab
   tabedit Xqftestfile1
   tabedit Xqftestfile2
+  tabedit Xqftestfile3
   tabfirst
   cfirst | cnext
   call assert_equal(2, tabpagenr())
   2cnext
   call assert_equal(3, tabpagenr())
-  2cnext
+  6cnext
-  call assert_equal(3, tabpagenr())
+  call assert_equal(4, tabpagenr())
+  2cpfile
+  call assert_equal(2, tabpagenr())
+  2cnfile
+  call assert_equal(4, tabpagenr())
   tabfirst | tabonly | enew
 
   set switchbuf=split
@@ -2338,7 +2374,7 @@ func XfreeTests(cchar)
   Xclose
 endfunc
 
-" Tests for the quickifx free functionality
+" Tests for the quickfix free functionality
 func Test_qf_free()
   call XfreeTests('c')
   call XfreeTests('l')
@@ -3165,3 +3201,174 @@ func Test_lvimgrep_crash()
   augroup END
   enew | only
 endfunc
+
+func Xqfjump_tests(cchar)
+  call s:setup_commands(a:cchar)
+
+  call writefile(["Line1\tFoo", "Line2"], 'F1')
+  call writefile(["Line1\tBar", "Line2"], 'F2')
+  call writefile(["Line1\tBaz", "Line2"], 'F3')
+
+  call g:Xsetlist([], 'f')
+
+  " Tests for
+  "   Jumping to a line using a pattern
+  "   Jumping to a column greater than the last column in a line
+  "   Jumping to a line greater than the last line in the file
+  let l = []
+  for i in range(1, 7)
+    call add(l, {})
+  endfor
+  let l[0].filename='F1'
+  let l[0].pattern='Line1'
+  let l[1].filename='F2'
+  let l[1].pattern='Line1'
+  let l[2].filename='F3'
+  let l[2].pattern='Line1'
+  let l[3].filename='F3'
+  let l[3].lnum=1
+  let l[3].col=9
+  let l[3].vcol=1
+  let l[4].filename='F3'
+  let l[4].lnum=99
+  let l[5].filename='F3'
+  let l[5].lnum=1
+  let l[5].col=99
+  let l[5].vcol=1
+  let l[6].filename='F3'
+  let l[6].pattern='abcxyz'
+
+  call g:Xsetlist([], ' ', {'items' : l})
+  Xopen | only
+  2Xnext
+  call assert_equal(3, g:Xgetlist({'idx' : 0}).idx)
+  call assert_equal('F3', bufname('%'))
+  Xnext
+  call assert_equal(7, col('.'))
+  Xnext
+  call assert_equal(2, line('.'))
+  Xnext
+  call assert_equal(9, col('.'))
+  2
+  Xnext
+  call assert_equal(2, line('.'))
+
+  if a:cchar == 'l'
+    " When jumping to a location list entry in the location list window and
+    " no usable windows are available, then a new window should be opened.
+    enew! | new | only
+    call g:Xsetlist([], 'f')
+    setlocal buftype=nofile
+    new
+    call g:Xsetlist([], ' ', {'lines' : ['F1:1:1:Line1', 'F1:2:2:Line2', 'F2:1:1:Line1', 'F2:2:2:Line2', 'F3:1:1:Line1', 'F3:2:2:Line2']})
+    Xopen
+    let winid = win_getid()
+    wincmd p
+    close
+    call win_gotoid(winid)
+    Xnext
+    call assert_equal(3, winnr('$'))
+    call assert_equal(1, winnr())
+    call assert_equal(2, line('.'))
+
+    " When jumping to an entry in the location list window and the window
+    " associated with the location list is not present and a window containing
+    " the file is already present, then that window should be used.
+    close
+    belowright new
+    call g:Xsetlist([], 'f')
+    edit F3
+    call win_gotoid(winid)
+    Xlast
+    call assert_equal(3, winnr())
+    call assert_equal(6, g:Xgetlist({'size' : 1}).size)
+    call assert_equal(winid, g:Xgetlist({'winid' : 1}).winid)
+  endif
+
+  " Cleanup
+  enew!
+  new | only
+
+  call delete('F1')
+  call delete('F2')
+  call delete('F3')
+endfunc
+
+func Test_qfjump()
+  call Xqfjump_tests('c')
+  call Xqfjump_tests('l')
+endfunc
+
+" The following test used to crash Vim.
+" Open the location list window and close the regular window associated with
+" the location list. When the garbage collection runs now, it incorrectly
+" marks the location list context as not in use and frees the context.
+func Test_ll_window_ctx()
+  call setloclist(0, [], 'f')
+  call setloclist(0, [], 'a', {'context' : []})
+  lopen | only
+  call test_garbagecollect_now()
+  echo getloclist(0, {'context' : 1}).context
+  enew | only
+endfunc
+
+" The following test used to crash vim
+func Test_lfile_crash()
+  sp Xtest
+  au QuickFixCmdPre * bw
+  call assert_fails('lfile', 'E40')
+  au! QuickFixCmdPre
+endfunc
+
+" Tests for quickfix/location lists changed by autocommands when
+" :vimgrep/:lvimgrep commands are running.
+func Test_vimgrep_autocmd()
+  call setqflist([], 'f')
+  call writefile(['stars'], 'Xtest1.txt')
+  call writefile(['stars'], 'Xtest2.txt')
+
+  " Test 1:
+  " When searching for a pattern using :vimgrep, if the quickfix list is
+  " changed by an autocmd, the results should be added to the correct quickfix
+  " list.
+  autocmd BufRead Xtest2.txt cexpr '' | cexpr ''
+  silent vimgrep stars Xtest*.txt
+  call assert_equal(1, getqflist({'nr' : 0}).nr)
+  call assert_equal(3, getqflist({'nr' : '$'}).nr)
+  call assert_equal('Xtest2.txt', bufname(getqflist()[1].bufnr))
+  au! BufRead Xtest2.txt
+
+  " Test 2:
+  " When searching for a pattern using :vimgrep, if the quickfix list is
+  " freed, then a error should be given.
+  silent! %bwipe!
+  call setqflist([], 'f')
+  autocmd BufRead Xtest2.txt for i in range(10) | cexpr '' | endfor
+  call assert_fails('vimgrep stars Xtest*.txt', 'E925:')
+  au! BufRead Xtest2.txt
+
+  " Test 3:
+  " When searching for a pattern using :lvimgrep, if the location list is
+  " freed, then the command should error out.
+  silent! %bwipe!
+  let g:save_winid = win_getid()
+  autocmd BufRead Xtest2.txt call setloclist(g:save_winid, [], 'f')
+  call assert_fails('lvimgrep stars Xtest*.txt', 'E926:')
+  au! BufRead Xtest2.txt
+
+  call delete('Xtest1.txt')
+  call delete('Xtest2.txt')
+  call setqflist([], 'f')
+endfunc
+
+func Test_lbuffer_with_bwipe()
+  new
+  new
+  augroup nasty
+    au * * bwipe
+  augroup END
+  lbuffer
+  augroup nasty
+    au!
+  augroup END
+endfunc