mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-06 18:06:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.2312: "line:" field in tags file not used

Browse Source 
Problem:    "line:" field in tags file not used.
Solution:   Recognize the field and use the value. (Andy Massimino, Daniel
            Hahler, closes vim/vim#5232, closes vim/vim#2546, closes vim/vim#1057)
077b9dd354
This commit is contained in:
Jan Edmund Lazo
2019-11-17 21:13:38 -05:00
parent 54402d6b8f
commit e4b185893f
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/tag.c
View File

@@ -65,6 +65,7 @@ typedef struct tag_pointers {
char_u *tagkind_end; // end of tagkind char_u *tagkind_end; // end of tagkind
char_u *user_data; // user_data string char_u *user_data; // user_data string
char_u *user_data_end; // end of user_data char_u *user_data_end; // end of user_data
linenr_T tagline; // "line:" value
} tagptrs_T; } tagptrs_T;
/* /*
@@ -2545,6 +2546,7 @@ parse_match(
tagp->tagkind = NULL; tagp->tagkind = NULL;
tagp->user_data = NULL; tagp->user_data = NULL;
tagp->tagline = 0;
tagp->command_end = NULL; tagp->command_end = NULL;
if (retval == OK) { if (retval == OK) {
@@ -2564,6 +2566,8 @@ parse_match(
tagp->tagkind = p + 5; tagp->tagkind = p + 5;
} else if (STRNCMP(p, "user_data:", 10) == 0) { } else if (STRNCMP(p, "user_data:", 10) == 0) {
tagp->user_data = p + 10; tagp->user_data = p + 10;
} else if (STRNCMP(p, "line:", 5) == 0) {
tagp->tagline = atoi((char *)p + 5);
} }
if (tagp->tagkind != NULL && tagp->user_data != NULL) { if (tagp->tagkind != NULL && tagp->user_data != NULL) {
break; break;
@@ -2811,7 +2815,13 @@ static int jumpto_tag(
p_ic = FALSE; /* don't ignore case now */ p_ic = FALSE; /* don't ignore case now */
p_scs = FALSE; p_scs = FALSE;
save_lnum = curwin->w_cursor.lnum; save_lnum = curwin->w_cursor.lnum;
curwin->w_cursor.lnum = 0; /* start search before first line */ if (tagp.tagline > 0) {
// start search before line from "line:" field
curwin->w_cursor.lnum = tagp.tagline - 1;
} else {
// start search before first line
curwin->w_cursor.lnum = 0;
}
if (do_search(NULL, pbuf[0], pbuf + 1, (long)1, if (do_search(NULL, pbuf[0], pbuf + 1, (long)1,
search_options, NULL)) { search_options, NULL)) {
retval = OK; retval = OK;

24
src/nvim/testdir/test_tagjump.vim
View File

@@ -466,4 +466,28 @@ func Test_tag_line_toolong()
let &verbose = old_vbs let &verbose = old_vbs
endfunc endfunc
func Test_tagline()
call writefile([
\ 'provision Xtest.py /^ def provision(self, **kwargs):$/;" m line:1 language:Python class:Foo',
\ 'provision Xtest.py /^ def provision(self, **kwargs):$/;" m line:3 language:Python class:Bar',
\], 'Xtags')
call writefile([
\ ' def provision(self, **kwargs):',
\ ' pass',
\ ' def provision(self, **kwargs):',
\ ' pass',
\], 'Xtest.py')
set tags=Xtags
1tag provision
call assert_equal(line('.'), 1)
2tag provision
call assert_equal(line('.'), 3)
call delete('Xtags')
call delete('Xtest.py')
set tags&
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab