diff options
author | James McCoy <jamessan@jamessan.com> | 2017-12-18 14:36:13 -0500 |
---|---|---|
committer | James McCoy <jamessan@jamessan.com> | 2017-12-18 14:56:17 -0500 |
commit | f0bd2bc39aeb7797e3dd5c14797606dac45c8a75 (patch) | |
tree | 018110d5cc0fa0e1b4a353b322494b1d82920090 /src/nvim/quickfix.c | |
parent | fb8592b7ba673f230f144dc8c29e5dffc33fc50a (diff) | |
download | rneovim-f0bd2bc39aeb7797e3dd5c14797606dac45c8a75.tar.gz rneovim-f0bd2bc39aeb7797e3dd5c14797606dac45c8a75.tar.bz2 rneovim-f0bd2bc39aeb7797e3dd5c14797606dac45c8a75.zip |
vim-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)
https://github.com/vim/vim/commit/69f40be64555d50f603c6f22722cf762aaa6bbc1
Diffstat (limited to 'src/nvim/quickfix.c')
-rw-r--r-- | src/nvim/quickfix.c | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index c7326c46fe..9a4341f3a4 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -4267,13 +4267,57 @@ static int qf_set_properties(qf_info_T *qi, dict_T *what, int action) return retval; } +// Find the non-location list window with the specified location list. +static win_T * find_win_with_ll(qf_info_T *qi) +{ + FOR_ALL_WINDOWS_IN_TAB(wp, curtab) { + 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); + + 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); + } + + win_T *llwin = NULL; + win_T *orig_wp = wp; + 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) { // quickfix list 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++; + } } } |