Mercurial > vim
changeset 11301:cc8ece2aa389 v8.0.0536
patch 8.0.0536: quickfix window not updated when freeing quickfix stack
commit https://github.com/vim/vim/commit/69f40be64555d50f603c6f22722cf762aaa6bbc1
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Apr 2 15:15:49 2017 +0200
patch 8.0.0536: quickfix window not updated when freeing quickfix stack
Problem: Quickfix window not updated when freeing quickfix stack.
Solution: Update the quickfix window. (Yegappan Lakshmanan)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 02 Apr 2017 15:30:04 +0200 |
| parents | 70dad27a2380 |
| children | e3ef35af5a08 |
| files | src/quickfix.c src/testdir/test_quickfix.vim src/version.c |
| diffstat | 3 files changed, 118 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/quickfix.c +++ b/src/quickfix.c @@ -4866,9 +4866,50 @@ qf_set_properties(qf_info_T *qi, dict_T return retval; } +/* + * Find the non-location list window with the specified location list. + */ + static win_T * +find_win_with_ll(qf_info_T *qi) +{ + win_T *wp = NULL; + + FOR_ALL_WINDOWS(wp) + if ((wp->w_llist == qi) && !bt_quickfix(wp->w_buffer)) + return wp; + + return NULL; +} + +/* + * Free the entire quickfix/location list stack. + * If the quickfix/location list window is open, then clear it. + */ static void qf_free_stack(win_T *wp, qf_info_T *qi) { + win_T *qfwin = qf_find_win(qi); + win_T *llwin = NULL; + win_T *orig_wp = wp; + + if (qfwin != NULL) + { + /* If the quickfix/location list window is open, then clear it */ + if (qi->qf_curlist < qi->qf_listcount) + qf_free(qi, qi->qf_curlist); + qf_update_buffer(qi, NULL); + } + + if (wp != NULL && IS_LL_WINDOW(wp)) + { + /* If in the location list window, then use the non-location list + * window with this location list (if present) + */ + llwin = find_win_with_ll(qi); + if (llwin != NULL) + wp = llwin; + } + qf_free_all(wp); if (wp == NULL) { @@ -4876,6 +4917,18 @@ qf_free_stack(win_T *wp, qf_info_T *qi) qi->qf_curlist = 0; qi->qf_listcount = 0; } + else if (IS_LL_WINDOW(orig_wp)) + { + /* If the location list window is open, then create a new empty + * location list */ + qf_info_T *new_ll = ll_new_list(); + orig_wp->w_llist_ref = new_ll; + if (llwin != NULL) + { + llwin->w_llist = new_ll; + new_ll->qf_refcount++; + } + } } /*
--- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -1912,3 +1912,66 @@ func Test_vimgrep() call XvimgrepTests('c') call XvimgrepTests('l') endfunc + +func XfreeTests(cchar) + call s:setup_commands(a:cchar) + + enew | only + + " Deleting the quickfix stack should work even When the current list is + " somewhere in the middle of the stack + Xexpr ['Xfile1:10:10:Line 10', 'Xfile1:15:15:Line 15'] + Xexpr ['Xfile2:20:20:Line 20', 'Xfile2:25:25:Line 25'] + Xexpr ['Xfile3:30:30:Line 30', 'Xfile3:35:35:Line 35'] + Xolder + call g:Xsetlist([], 'f') + call assert_equal(0, len(g:Xgetlist())) + + " After deleting the stack, adding a new list should create a stack with a + " single list. + Xexpr ['Xfile1:10:10:Line 10', 'Xfile1:15:15:Line 15'] + call assert_equal(1, g:Xgetlist({'all':1}).nr) + + " Deleting the stack from a quickfix window should update/clear the + " quickfix/location list window. + Xexpr ['Xfile1:10:10:Line 10', 'Xfile1:15:15:Line 15'] + Xexpr ['Xfile2:20:20:Line 20', 'Xfile2:25:25:Line 25'] + Xexpr ['Xfile3:30:30:Line 30', 'Xfile3:35:35:Line 35'] + Xolder + Xwindow + call g:Xsetlist([], 'f') + call assert_equal(2, winnr('$')) + call assert_equal(1, line('$')) + Xclose + + " Deleting the stack from a non-quickfix window should update/clear the + " quickfix/location list window. + Xexpr ['Xfile1:10:10:Line 10', 'Xfile1:15:15:Line 15'] + Xexpr ['Xfile2:20:20:Line 20', 'Xfile2:25:25:Line 25'] + Xexpr ['Xfile3:30:30:Line 30', 'Xfile3:35:35:Line 35'] + Xolder + Xwindow + wincmd p + call g:Xsetlist([], 'f') + call assert_equal(0, len(g:Xgetlist())) + wincmd p + call assert_equal(2, winnr('$')) + call assert_equal(1, line('$')) + + " After deleting the location list stack, if the location list window is + " opened, then a new location list should be created. So opening the + " location list window again should not create a new window. + if a:cchar == 'l' + lexpr ['Xfile1:10:10:Line 10', 'Xfile1:15:15:Line 15'] + wincmd p + lopen + call assert_equal(2, winnr('$')) + endif + Xclose +endfunc + +" Tests for the quickifx free functionality +func Test_qf_free() + call XfreeTests('c') + call XfreeTests('l') +endfunc