diff options
| -rw-r--r-- | src/nvim/tag.c | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test_taglist.vim | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/nvim/tag.c b/src/nvim/tag.c index c5df68d451..429dd191b7 100644 --- a/src/nvim/tag.c +++ b/src/nvim/tag.c @@ -1609,7 +1609,6 @@ static tags_read_status_T findtags_get_next_line(findtags_state_T *st, tagsearch // skip empty and blank lines do { - sinfo_p->curr_offset = vim_ftell(st->fp); eof = vim_fgets((char_u *)st->lbuf, st->lbuf_size, st->fp); } while (!eof && vim_isblankline(st->lbuf)); @@ -2161,7 +2160,7 @@ line_read_in: xfree(st->lbuf); st->lbuf = xmalloc((size_t)st->lbuf_size); - if (st->state == TS_STEP_FORWARD) { + if (st->state == TS_STEP_FORWARD || st->state == TS_LINEAR) { // Seek to the same position to read the same line again vim_ignored = vim_fseek(st->fp, search_info.curr_offset, SEEK_SET); } diff --git a/src/nvim/testdir/test_taglist.vim b/src/nvim/testdir/test_taglist.vim index 1a3d1986bf..0387ef2bd8 100644 --- a/src/nvim/testdir/test_taglist.vim +++ b/src/nvim/testdir/test_taglist.vim @@ -264,8 +264,15 @@ func Test_tag_complete_with_overlong_line() call writefile(tagslines, 'Xtags') set tags=Xtags + " try with binary search + set tagbsearch call feedkeys(":tag inbou\<C-A>\<C-B>\"\<CR>", 'xt') call assert_equal('"tag inboundGSV inboundGovernor inboundGovernorCounters', @:) + " try with linear search + set notagbsearch + call feedkeys(":tag inbou\<C-A>\<C-B>\"\<CR>", 'xt') + call assert_equal('"tag inboundGSV inboundGovernor inboundGovernorCounters', @:) + set tagbsearch& call delete('Xtags') set tags& |