patch 8.1.0622: adding quickfix items marks items as valid errors

Problem:    Adding quickfix items marks items as valid errors. (Daniel Hahler)
Solution:   Check when items are valid. (Yegappan Lakshmanan, closes #3683,
            closes #3633)

diff --git a/src/quickfix.c b/src/quickfix.c
index 5291fb1115989b30c64e563b3c55fcde75d5c23b..71fe4939ff010d110ea871376c1b1b52ca876b9e 100644 (file)
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -6241,14 +6241,16 @@ qf_get_properties(win_T *wp, dict_T *what, dict_T *retdict)
 
 /*
  * Add a new quickfix entry to list at 'qf_idx' in the stack 'qi' from the
- * items in the dict 'd'.
+ * items in the dict 'd'. If it is a valid error entry, then set 'valid_entry'
+ * to TRUE.
  */
     static int
 qf_add_entry_from_dict(
        qf_info_T       *qi,
        int             qf_idx,
        dict_T          *d,
-       int             first_entry)
+       int             first_entry,
+       int             *valid_entry)
 {
     static int did_bufnr_emsg;
     char_u     *filename, *module, *pattern, *text, *type;
@@ -6313,6 +6315,9 @@ qf_add_entry_from_dict(
     vim_free(text);
     vim_free(type);
 
+    if (valid)
+       *valid_entry = TRUE;
+
     return status;
 }
 
@@ -6333,6 +6338,7 @@ qf_add_entries(
     dict_T     *d;
     qfline_T   *old_last = NULL;
     int                retval = OK;
+    int                valid_entry = FALSE;
 
     if (action == ' ' || qf_idx == qi->qf_listcount)
     {
@@ -6359,22 +6365,27 @@ qf_add_entries(
        if (d == NULL)
            continue;
 
-       retval = qf_add_entry_from_dict(qi, qf_idx, d, li == list->lv_first);
+       retval = qf_add_entry_from_dict(qi, qf_idx, d, li == list->lv_first,
+                                                               &valid_entry);
        if (retval == FAIL)
            break;
     }
 
-    if (qfl->qf_index == 0)
+    // Check if any valid error entries are added to the list.
+    if (valid_entry)
+       qfl->qf_nonevalid = FALSE;
+    else if (qfl->qf_index == 0)
        // no valid entry
        qfl->qf_nonevalid = TRUE;
-    else
-       qfl->qf_nonevalid = FALSE;
+
+    // If not appending to the list, set the current error to the first entry
     if (action != 'a')
-    {
        qfl->qf_ptr = qfl->qf_start;
-       if (!qf_list_empty(qi, qf_idx))
-           qfl->qf_index = 1;
-    }
+
+    // Update the current error index if not appending to the list or if the
+    // list was empty before and it is not empty now.
+    if ((action != 'a' || qfl->qf_index == 0) && !qf_list_empty(qi, qf_idx))
+       qfl->qf_index = 1;
 
     // Don't update the cursor in quickfix window when appending entries
     qf_update_buffer(qi, old_last);

diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim
index be03b41e0fb76d13c3071299da2e02f8b047b95c..7fdfc73aaa0134949798440e72d28b77eb3d22cc 100644 (file)
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -1299,6 +1299,28 @@ func SetXlistTests(cchar, bnum)
   let l = g:Xgetlist()
   call g:Xsetlist(l)
   call assert_equal(0, g:Xgetlist()[0].valid)
+  " Adding a non-valid entry should not mark the list as having valid entries
+  call g:Xsetlist([{'bufnr':a:bnum, 'lnum':5, 'valid':0}], 'a')
+  Xwindow
+  call assert_equal(1, winnr('$'))
+
+  " :cnext/:cprev should still work even with invalid entries in the list
+  let l = [{'bufnr' : a:bnum, 'lnum' : 1, 'text' : '1', 'valid' : 0},
+             \ {'bufnr' : a:bnum, 'lnum' : 2, 'text' : '2', 'valid' : 0}]
+  call g:Xsetlist(l)
+  Xnext
+  call assert_equal(2, g:Xgetlist({'idx' : 0}).idx)
+  Xprev
+  call assert_equal(1, g:Xgetlist({'idx' : 0}).idx)
+  " :cnext/:cprev should still work after appending invalid entries to an
+  " empty list
+  call g:Xsetlist([])
+  call g:Xsetlist(l, 'a')
+  Xnext
+  call assert_equal(2, g:Xgetlist({'idx' : 0}).idx)
+  Xprev
+  call assert_equal(1, g:Xgetlist({'idx' : 0}).idx)
+
   call g:Xsetlist([{'text':'Text1', 'valid':1}])
   Xwindow
   call assert_equal(2, winnr('$'))

diff --git a/src/version.c b/src/version.c
index 40c3c5a2f30bfbc362ad5de6f6561938c9f3d9e5..bb0c81f7dabaf38d8018bb165e66732c4d6b85ed 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    622,
 /**/
     621,
 /**/