patch 9.1.1423: :tag command not working correctly using Vim9 Script
Problem: :tag command not working correctly using Vim9 Script
Solution: inject a ':' before the numeric address, to make the command
valid in Vim9 context
fixes: #17415
closes: #17418
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
17
src/tag.c
17
src/tag.c
@ -3714,6 +3714,7 @@ jumpto_tag(
|
|||||||
#endif
|
#endif
|
||||||
size_t len;
|
size_t len;
|
||||||
char_u *lbuf;
|
char_u *lbuf;
|
||||||
|
int isdigit = FALSE;
|
||||||
|
|
||||||
if (postponed_split == 0 && !check_can_set_curbuf_forceit(forceit))
|
if (postponed_split == 0 && !check_can_set_curbuf_forceit(forceit))
|
||||||
return FAIL;
|
return FAIL;
|
||||||
@ -3725,7 +3726,7 @@ jumpto_tag(
|
|||||||
if (lbuf != NULL)
|
if (lbuf != NULL)
|
||||||
mch_memmove(lbuf, lbuf_arg, len);
|
mch_memmove(lbuf, lbuf_arg, len);
|
||||||
|
|
||||||
pbuf = alloc(LSIZE);
|
pbuf = alloc_clear(LSIZE);
|
||||||
|
|
||||||
// parse the match line into the tagp structure
|
// parse the match line into the tagp structure
|
||||||
if (pbuf == NULL || lbuf == NULL || parse_match(lbuf, &tagp) == FAIL)
|
if (pbuf == NULL || lbuf == NULL || parse_match(lbuf, &tagp) == FAIL)
|
||||||
@ -3740,14 +3741,21 @@ jumpto_tag(
|
|||||||
|
|
||||||
// copy the command to pbuf[], remove trailing CR/NL
|
// copy the command to pbuf[], remove trailing CR/NL
|
||||||
str = tagp.command;
|
str = tagp.command;
|
||||||
for (pbuf_end = pbuf; *str && *str != '\n' && *str != '\r'; )
|
if (VIM_ISDIGIT(*str))
|
||||||
|
{
|
||||||
|
// need to inject a ':' for a proper Vim9 :nr command
|
||||||
|
isdigit = TRUE;
|
||||||
|
pbuf[0] = ':';
|
||||||
|
}
|
||||||
|
for (pbuf_end = pbuf + isdigit;
|
||||||
|
*str && *str != '\n' && *str != '\r'; )
|
||||||
{
|
{
|
||||||
#ifdef FEAT_EMACS_TAGS
|
#ifdef FEAT_EMACS_TAGS
|
||||||
if (tagp.is_etag && *str == ',')// stop at ',' after line number
|
if (tagp.is_etag && *str == ',')// stop at ',' after line number
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
*pbuf_end++ = *str++;
|
*pbuf_end++ = *str++;
|
||||||
if (pbuf_end - pbuf + 1 >= LSIZE)
|
if (pbuf_end - pbuf + 1 + isdigit >= LSIZE)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
*pbuf_end = NUL;
|
*pbuf_end = NUL;
|
||||||
@ -3760,6 +3768,9 @@ jumpto_tag(
|
|||||||
* Remove the "<Tab>fieldname:value" stuff; we don't need it here.
|
* Remove the "<Tab>fieldname:value" stuff; we don't need it here.
|
||||||
*/
|
*/
|
||||||
str = pbuf;
|
str = pbuf;
|
||||||
|
// skip over the ':'
|
||||||
|
if (isdigit)
|
||||||
|
str++;
|
||||||
if (find_extra(&str) == OK)
|
if (find_extra(&str) == OK)
|
||||||
{
|
{
|
||||||
pbuf_end = str;
|
pbuf_end = str;
|
||||||
|
|||||||
@ -1650,4 +1650,25 @@ func Test_tag_excmd_with_nostartofline()
|
|||||||
set startofline&
|
set startofline&
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_tag_excmd_with_number_vim9script()
|
||||||
|
call writefile(["1#1\tXfile\t2;\"\ti"], 'Xtags', 'D')
|
||||||
|
call writefile(['f', 'foobar'], 'Xfile', 'D')
|
||||||
|
let list =<< trim END
|
||||||
|
vim9script
|
||||||
|
command! Tag call Tag()
|
||||||
|
def Tag(): void
|
||||||
|
exe "tag 1#1"
|
||||||
|
enddef
|
||||||
|
END
|
||||||
|
call writefile(list, 'Xtags.vim', 'D')
|
||||||
|
|
||||||
|
setlocal tags=Xtags
|
||||||
|
so Xtags.vim
|
||||||
|
:Tag
|
||||||
|
call assert_equal('Xfile', bufname('%'))
|
||||||
|
call assert_equal(2, line('.'))
|
||||||
|
|
||||||
|
bwipe!
|
||||||
|
endfunc
|
||||||
|
|
||||||
" vim: shiftwidth=2 sts=2 expandtab
|
" vim: shiftwidth=2 sts=2 expandtab
|
||||||
|
|||||||
@ -709,6 +709,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1423,
|
||||||
/**/
|
/**/
|
||||||
1422,
|
1422,
|
||||||
/**/
|
/**/
|
||||||
|
|||||||
Reference in New Issue
Block a user