thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.2.3776: when a tags file line is long a tag may not be found

Browse Source 
Problem:    When a tags file line is long a tag may not be found.
Solution:   When increasing the buffer size read the same line again.
This commit is contained in:
Bram Moolenaar 2021-12-10 20:15:15 +00:00
parent 9fffef9f35
commit f8e9eb8e17
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tag.c
View File

@ -2011,8 +2011,6 @@ find_tags(
eof = vim_fgets(lbuf, lbuf_size, fp); eof = vim_fgets(lbuf, lbuf_size, fp);
if (!eof && search_info.curr_offset != 0) if (!eof && search_info.curr_offset != 0)
{ {
// The explicit cast is to work around a bug in gcc 3.4.2
// (repeated below).
search_info.curr_offset = vim_ftell(fp); search_info.curr_offset = vim_ftell(fp);
if (search_info.curr_offset == search_info.high_offset) if (search_info.curr_offset == search_info.high_offset)
{ {
@ -2052,7 +2050,10 @@ find_tags(
eof = cs_fgets(lbuf, lbuf_size); eof = cs_fgets(lbuf, lbuf_size);
else else
#endif #endif
{
search_info.curr_offset = vim_ftell(fp);
eof = vim_fgets(lbuf, lbuf_size, fp); eof = vim_fgets(lbuf, lbuf_size, fp);
}
} while (!eof && vim_isblankline(lbuf)); } while (!eof && vim_isblankline(lbuf));
if (eof) if (eof)
@ -2294,6 +2295,10 @@ parse_line:
lbuf = alloc(lbuf_size); lbuf = alloc(lbuf_size);
if (lbuf == NULL) if (lbuf == NULL)
goto findtag_end; goto findtag_end;
if (state == TS_STEP_FORWARD)
// Seek to the same position to read the same line again
vim_fseek(fp, search_info.curr_offset, SEEK_SET);
#ifdef FEAT_TAG_BINS #ifdef FEAT_TAG_BINS
// this will try the same thing again, make sure the offset is // this will try the same thing again, make sure the offset is
// different // different

19
src/testdir/test_taglist.vim
View File

@ -236,4 +236,23 @@ func Test_tag_complete_wildoptions()
set tags& set tags&
endfunc endfunc
func Test_tag_complete_with_overlong_line()
let tagslines =<< trim END
!_TAG_FILE_FORMAT 2 //
!_TAG_FILE_SORTED 1 //
!_TAG_FILE_ENCODING utf-8 //
inboundGSV a 1;" r
inboundGovernor a 2;" kind:⊢ type:forall (muxMode :: MuxMode) socket peerAddr versionNumber m a b. (MonadAsync m, MonadCatch m, MonadEvaluate m, MonadThrow m, MonadThrow (STM m), MonadTime m, MonadTimer m, MonadMask m, Ord peerAddr, HasResponder muxMode ~ True) => Tracer m (RemoteTransitionTrace peerAddr) -> Tracer m (InboundGovernorTrace peerAddr) -> ServerControlChannel muxMode peerAddr ByteString m a b -> DiffTime -> MuxConnectionManager muxMode socket peerAddr versionNumber ByteString m a b -> StrictTVar m InboundGovernorObservableState -> m Void
inboundGovernorCounters a 3;" kind:⊢ type:InboundGovernorState muxMode peerAddr m a b -> InboundGovernorCounters
END
call writefile(tagslines, 'Xtags')
set tags=Xtags
call feedkeys(":tag inbou\<C-A>\<C-B>\"\<CR>", 'xt')
call assert_equal('"tag inboundGSV inboundGovernor inboundGovernorCounters', @:)
call delete('Xtags')
set tags&
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

@ -753,6 +753,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 */
/**/
3776,
/**/ /**/
3775, 3775,
/**/ /**/