patch 8.1.0493: argv() and argc() only work on the current argument list
Problem: argv() and argc() only work on the current argument list.
Solution: Add a window ID argument. (Yegappan Lakshmanan, closes #832)
diff --git a/src/eval.c b/src/eval.c
index 7c462fb..e70bfd8 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -8193,9 +8193,7 @@
tabpage_T *tp) /* NULL for current tab page */
{
win_T *wp;
- int nr;
-
- nr = (int)get_tv_number_chk(vp, NULL);
+ int nr = (int)get_tv_number_chk(vp, NULL);
if (nr < 0)
return NULL;
@@ -8218,6 +8216,20 @@
}
/*
+ * Find a window: When using a Window ID in any tab page, when using a number
+ * in the current tab page.
+ */
+ win_T *
+find_win_by_nr_or_id(typval_T *vp)
+{
+ int nr = (int)get_tv_number_chk(vp, NULL);
+
+ if (nr >= LOWEST_WIN_ID)
+ return win_id2wp(vp);
+ return find_win_by_nr(vp, NULL);
+}
+
+/*
* Find window specified by "wvp" in tabpage "tvp".
*/
win_T *
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 0d79996..b697524 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -501,10 +501,10 @@
{"and", 2, 2, f_and},
{"append", 2, 2, f_append},
{"appendbufline", 3, 3, f_appendbufline},
- {"argc", 0, 0, f_argc},
+ {"argc", 0, 1, f_argc},
{"argidx", 0, 0, f_argidx},
{"arglistid", 0, 2, f_arglistid},
- {"argv", 0, 1, f_argv},
+ {"argv", 0, 2, f_argv},
#ifdef FEAT_FLOAT
{"asin", 1, 1, f_asin}, /* WJMc */
#endif
@@ -1407,12 +1407,29 @@
}
/*
- * "argc()" function
+ * "argc([window id])" function
*/
static void
-f_argc(typval_T *argvars UNUSED, typval_T *rettv)
+f_argc(typval_T *argvars, typval_T *rettv)
{
- rettv->vval.v_number = ARGCOUNT;
+ win_T *wp;
+
+ if (argvars[0].v_type == VAR_UNKNOWN)
+ // use the current window
+ rettv->vval.v_number = ARGCOUNT;
+ else if (argvars[0].v_type == VAR_NUMBER
+ && get_tv_number(&argvars[0]) == -1)
+ // use the global argument list
+ rettv->vval.v_number = GARGCOUNT;
+ else
+ {
+ // use the argument list of the specified window
+ wp = find_win_by_nr_or_id(&argvars[0]);
+ if (wp != NULL)
+ rettv->vval.v_number = WARGCOUNT(wp);
+ else
+ rettv->vval.v_number = -1;
+ }
}
/*
@@ -1439,26 +1456,64 @@
}
/*
+ * Get the argument list for a given window
+ */
+ static void
+get_arglist_as_rettv(aentry_T *arglist, int argcount, typval_T *rettv)
+{
+ int idx;
+
+ if (rettv_list_alloc(rettv) == OK && arglist != NULL)
+ for (idx = 0; idx < argcount; ++idx)
+ list_append_string(rettv->vval.v_list,
+ alist_name(&arglist[idx]), -1);
+}
+
+/*
* "argv(nr)" function
*/
static void
f_argv(typval_T *argvars, typval_T *rettv)
{
int idx;
+ aentry_T *arglist = NULL;
+ int argcount = -1;
if (argvars[0].v_type != VAR_UNKNOWN)
{
- idx = (int)get_tv_number_chk(&argvars[0], NULL);
- if (idx >= 0 && idx < ARGCOUNT)
- rettv->vval.v_string = vim_strsave(alist_name(&ARGLIST[idx]));
+ if (argvars[1].v_type == VAR_UNKNOWN)
+ {
+ arglist = ARGLIST;
+ argcount = ARGCOUNT;
+ }
+ else if (argvars[1].v_type == VAR_NUMBER
+ && get_tv_number(&argvars[1]) == -1)
+ {
+ arglist = GARGLIST;
+ argcount = GARGCOUNT;
+ }
else
- rettv->vval.v_string = NULL;
+ {
+ win_T *wp = find_win_by_nr_or_id(&argvars[1]);
+
+ if (wp != NULL)
+ {
+ /* Use the argument list of the specified window */
+ arglist = WARGLIST(wp);
+ argcount = WARGCOUNT(wp);
+ }
+ }
+
rettv->v_type = VAR_STRING;
+ rettv->vval.v_string = NULL;
+ idx = get_tv_number_chk(&argvars[0], NULL);
+ if (arglist != NULL && idx >= 0 && idx < argcount)
+ rettv->vval.v_string = vim_strsave(alist_name(&arglist[idx]));
+ else if (idx == -1)
+ get_arglist_as_rettv(arglist, argcount, rettv);
}
- else if (rettv_list_alloc(rettv) == OK)
- for (idx = 0; idx < ARGCOUNT; ++idx)
- list_append_string(rettv->vval.v_list,
- alist_name(&ARGLIST[idx]), -1);
+ else
+ get_arglist_as_rettv(ARGLIST, ARGCOUNT, rettv);
}
/*
@@ -5358,7 +5413,6 @@
rettv->vval.v_number = FALSE;
}
-
/*
* "getcurpos()" function
*/
@@ -6982,7 +7036,6 @@
rettv->vval.v_number = selected;
}
-
static garray_T ga_userinput = {0, 0, sizeof(tasave_T), 4, NULL};
/*
@@ -12397,7 +12450,6 @@
modec = 't';
}
-
switch (TOLOWER_ASC(what[0]))
{
case 'b':
@@ -12808,7 +12860,6 @@
}
}
-
/*
* "tabpagenr()" function
*/
@@ -12900,7 +12951,6 @@
rettv->vval.v_number = nr;
}
-
/*
* "tagfiles()" function
*/
@@ -14092,5 +14142,4 @@
^ get_tv_number_chk(&argvars[1], NULL);
}
-
#endif /* FEAT_EVAL */
diff --git a/src/proto/eval.pro b/src/proto/eval.pro
index 37170a2..03c6506 100644
--- a/src/proto/eval.pro
+++ b/src/proto/eval.pro
@@ -111,6 +111,7 @@
void ex_echohl(exarg_T *eap);
void ex_execute(exarg_T *eap);
win_T *find_win_by_nr(typval_T *vp, tabpage_T *tp);
+win_T *find_win_by_nr_or_id(typval_T *vp);
win_T *find_tabwin(typval_T *wvp, typval_T *tvp);
void getwinvar(typval_T *argvars, typval_T *rettv, int off);
void setwinvar(typval_T *argvars, typval_T *rettv, int off);
diff --git a/src/testdir/test_arglist.vim b/src/testdir/test_arglist.vim
index 057cb0d..b896c3d 100644
--- a/src/testdir/test_arglist.vim
+++ b/src/testdir/test_arglist.vim
@@ -278,13 +278,53 @@
call assert_equal(0, arglistid())
endfunc
-" Test for argv()
+" Tests for argv() and argc()
func Test_argv()
call Reset_arglist()
call assert_equal([], argv())
call assert_equal("", argv(2))
+ call assert_equal(0, argc())
argadd a b c d
+ call assert_equal(4, argc())
call assert_equal('c', argv(2))
+
+ let w1_id = win_getid()
+ split
+ let w2_id = win_getid()
+ arglocal
+ args e f g
+ tabnew
+ let w3_id = win_getid()
+ split
+ let w4_id = win_getid()
+ argglobal
+ tabfirst
+ call assert_equal(4, argc(w1_id))
+ call assert_equal('b', argv(1, w1_id))
+ call assert_equal(['a', 'b', 'c', 'd'], argv(-1, w1_id))
+
+ call assert_equal(3, argc(w2_id))
+ call assert_equal('f', argv(1, w2_id))
+ call assert_equal(['e', 'f', 'g'], argv(-1, w2_id))
+
+ call assert_equal(3, argc(w3_id))
+ call assert_equal('e', argv(0, w3_id))
+ call assert_equal(['e', 'f', 'g'], argv(-1, w3_id))
+
+ call assert_equal(4, argc(w4_id))
+ call assert_equal('c', argv(2, w4_id))
+ call assert_equal(['a', 'b', 'c', 'd'], argv(-1, w4_id))
+
+ call assert_equal(4, argc(-1))
+ call assert_equal(3, argc())
+ call assert_equal('d', argv(3, -1))
+ call assert_equal(['a', 'b', 'c', 'd'], argv(-1, -1))
+ tabonly | only | enew!
+ " Negative test cases
+ call assert_equal(-1, argc(100))
+ call assert_equal('', argv(1, 100))
+ call assert_equal([], argv(-1, 100))
+ call assert_equal('', argv(10, -1))
endfunc
" Test for the :argedit command
diff --git a/src/version.c b/src/version.c
index 9283cc2..7900ee7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 493,
+/**/
492,
/**/
491,