forked from aniani/vim
patch 8.2.1499: Vim9: error when using "$" with col()
Problem: Vim9: error when using "$" with col(). Solution: Reorder getting the column value. (closes #6744)
This commit is contained in:
parent
733d259a83
commit
ec65d77fa2
14
src/eval.c
14
src/eval.c
@ -4841,19 +4841,23 @@ var2fpos(
|
||||
pos.lnum = list_find_nr(l, 0L, &error);
|
||||
if (error || pos.lnum <= 0 || pos.lnum > curbuf->b_ml.ml_line_count)
|
||||
return NULL; // invalid line number
|
||||
|
||||
// Get the column number
|
||||
pos.col = list_find_nr(l, 1L, &error);
|
||||
if (error)
|
||||
return NULL;
|
||||
len = (long)STRLEN(ml_get(pos.lnum));
|
||||
|
||||
// Get the column number
|
||||
// We accept "$" for the column number: last column.
|
||||
li = list_find(l, 1L);
|
||||
if (li != NULL && li->li_tv.v_type == VAR_STRING
|
||||
&& li->li_tv.vval.v_string != NULL
|
||||
&& STRCMP(li->li_tv.vval.v_string, "$") == 0)
|
||||
{
|
||||
pos.col = len + 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
pos.col = list_find_nr(l, 1L, &error);
|
||||
if (error)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// Accept a position up to the NUL after the line.
|
||||
if (pos.col == 0 || (int)pos.col > len + 1)
|
||||
|
@ -1320,6 +1320,12 @@ def Test_bufnr()
|
||||
assert_equal(buf, bufnr('%'))
|
||||
enddef
|
||||
|
||||
def Test_col()
|
||||
new
|
||||
setline(1, 'asdf')
|
||||
assert_equal(5, col([1, '$']))
|
||||
enddef
|
||||
|
||||
def Test_getreg_return_type()
|
||||
let s1: string = getreg('"')
|
||||
let s2: string = getreg('"', 1)
|
||||
|
@ -754,6 +754,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1499,
|
||||
/**/
|
||||
1498,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user