Hi,
Currently all the available quickfix commands and functions that parse
text using 'erroformat' add the resulting entries to a quickfix list in the
stack. There have been several requests in the past to add support for
parsing text using 'erroformat' without modifying the quickfix lists in
the stack. This is useful for Vim plugins that deal with quickfix lists.
I am attaching a patch to add this feature.
To parse text without modifying the quickfix lists, the getqflist() function
can be used as shown below:
echo getqflist({'text': "File10:10:Line10\nFile20:20:Line20"})
or
echo getqflist({'text': ["File10:10:Line10", "File10:20:Line20"]})
The above call returns a dictionary where the 'items' key will contain
all the parsed entries.
The getloclist() function can also be used instead of getqflist().
- Yegappan
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 37e849c90..a1a76f914 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -4616,6 +4616,11 @@ getqflist([{what}])
*getqflist()*
nr get information for this quickfix list; zero
means the current quickfix list and '$' means
the last quickfix list
+ text use 'errorformat' to extract items from the
+ text and return the resulting entries. The
+ value can be a string with one line or a list
+ with multiple lines. The current quickfix list
+ is not modified.
title get the list title
winid get the |window-ID| (if opened)
all all of the above quickfix properties
@@ -4624,6 +4629,9 @@ getqflist([{what}])
*getqflist()*
To get the number of lists in the quickfix stack, set 'nr' to
'$' in {what}. The 'nr' value in the returned dictionary
contains the quickfix stack size.
+ When 'text' is specified, all the other items are ignored. The
+ returned dictionary contains the entry 'items' with the list
+ of entries.
In case of error processing {what}, an empty dictionary is
returned.
diff --git a/src/evalfunc.c b/src/evalfunc.c
index c85c334c8..185bbd5a4 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -4810,7 +4810,7 @@ get_qf_loc_list(int is_qf, win_T *wp, typval_T *what_arg,
typval_T *rettv)
{
if (rettv_list_alloc(rettv) == OK)
if (is_qf || wp != NULL)
- (void)get_errorlist(wp, -1, rettv->vval.v_list);
+ (void)get_errorlist(NULL, wp, -1, rettv->vval.v_list);
}
else
{
diff --git a/src/proto/quickfix.pro b/src/proto/quickfix.pro
index 4418cc47b..ad6ad3433 100644
--- a/src/proto/quickfix.pro
+++ b/src/proto/quickfix.pro
@@ -21,7 +21,7 @@ void ex_cc(exarg_T *eap);
void ex_cnext(exarg_T *eap);
void ex_cfile(exarg_T *eap);
void ex_vimgrep(exarg_T *eap);
-int get_errorlist(win_T *wp, int qf_idx, list_T *list);
+int get_errorlist(qf_info_T *qi, win_T *wp, int qf_idx, list_T *list);
int get_errorlist_properties(win_T *wp, dict_T *what, dict_T *retdict);
int set_errorlist(win_T *wp, list_T *list, int action, char_u *title, dict_T
*what);
int set_ref_in_quickfix(int copyID);
diff --git a/src/quickfix.c b/src/quickfix.c
index 42077c2a3..c81e5b4b2 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -2762,7 +2762,7 @@ qf_free_items(qf_info_T *qi, int idx)
{
qfp = qfl->qf_start;
qfpnext = qfp->qf_next;
- if (qfl->qf_title != NULL && !stop)
+ if (!stop)
{
vim_free(qfp->qf_text);
stop = (qfp == qfpnext);
@@ -4556,20 +4556,23 @@ unload_dummy_buffer(buf_T *buf, char_u *dirname_start)
* If qf_idx is -1, use the current list. Otherwise, use the specified list.
*/
int
-get_errorlist(win_T *wp, int qf_idx, list_T *list)
+get_errorlist(qf_info_T *qi, win_T *wp, int qf_idx, list_T *list)
{
- qf_info_T *qi = &ql_info;
dict_T *dict;
char_u buf[2];
qfline_T *qfp;
int i;
int bufnum;
- if (wp != NULL)
+ if (qi == NULL)
{
- qi = GET_LOC_LIST(wp);
- if (qi == NULL)
- return FAIL;
+ qi = &ql_info;
+ if (wp != NULL)
+ {
+ qi = GET_LOC_LIST(wp);
+ if (qi == NULL)
+ return FAIL;
+ }
}
if (qf_idx == -1)
@@ -4628,6 +4631,45 @@ enum {
};
/*
+ * Parse text from 'di' and return the quickfix list items
+ */
+ static int
+qf_get_list_from_text(dictitem_T *di, dict_T *retdict)
+{
+ int status = FAIL;
+ qf_info_T *qi;
+
+ /* Only string and list values are supported */
+ if ((di->di_tv.v_type == VAR_STRING && di->di_tv.vval.v_string != NULL)
+ || (di->di_tv.v_type == VAR_LIST
+ && di->di_tv.vval.v_list != NULL))
+ {
+ qi = (qf_info_T *)alloc((unsigned)sizeof(qf_info_T));
+ if (qi != NULL)
+ {
+ vim_memset(qi, 0, (size_t)(sizeof(qf_info_T)));
+ qi->qf_refcount++;
+
+ if (qf_init_ext(qi, 0, NULL, NULL, &di->di_tv, p_efm,
+ TRUE, (linenr_T)0, (linenr_T)0, NULL, NULL) > 0)
+ {
+ list_T *l = list_alloc();
+ if (l != NULL)
+ {
+ (void)get_errorlist(qi, NULL, 0, l);
+ dict_add_list(retdict, "items", l);
+ status = OK;
+ }
+ qf_free(qi, 0);
+ }
+ free(qi);
+ }
+ }
+
+ return status;
+}
+
+/*
* Return quickfix/location list details (title) as a
* dictionary. 'what' contains the details to return. If 'list_idx' is -1,
* then current list is used. Otherwise the specified list is used.
@@ -4641,6 +4683,9 @@ get_errorlist_properties(win_T *wp, dict_T *what, dict_T
*retdict)
dictitem_T *di;
int flags = QF_GETLIST_NONE;
+ if ((di = dict_find(what, (char_u *)"text", -1)) != NULL)
+ return qf_get_list_from_text(di, retdict);
+
if (wp != NULL)
{
qi = GET_LOC_LIST(wp);
@@ -4726,7 +4771,7 @@ get_errorlist_properties(win_T *wp, dict_T *what, dict_T
*retdict)
list_T *l = list_alloc();
if (l != NULL)
{
- (void)get_errorlist(wp, qf_idx, l);
+ (void)get_errorlist(qi, NULL, qf_idx, l);
dict_add_list(retdict, "items", l);
}
else
diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim
index 8fa715395..32b04c34e 100644
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -2519,3 +2519,29 @@ func Test_add_qf()
call XaddQf_tests('c')
call XaddQf_tests('l')
endfunc
+
+" Test for getting the quickfix list items from some text without modifying
+" the quickfix stack
+func XgetListFromText(cchar)
+ call s:setup_commands(a:cchar)
+ call g:Xsetlist([], 'f')
+
+ let l = g:Xgetlist({'text' : "File1:10:Line10"}).items
+ call assert_equal(1, len(l))
+ call assert_equal('Line10', l[0].text)
+
+ let l = g:Xgetlist({'text' : ["File2:20:Line20", "File2:30:Line30"]}).items
+ call assert_equal(2, len(l))
+ call assert_equal(30, l[1].lnum)
+
+ call assert_equal({}, g:Xgetlist({'text' : 10}))
+ call assert_equal({}, g:Xgetlist({'text' : []}))
+
+ " Make sure that the quickfix stack is not modified
+ call assert_equal(0, g:Xgetlist({'nr' : '$'}).nr)
+endfunc
+
+func Test_get_list_from_text()
+ call XgetListFromText('c')
+ call XgetListFromText('l')
+endfunc
