diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-12-10 20:15:15 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-12-10 20:15:15 +0000 |
| commit | f8e9eb8e173bf0ff9560192ae888941ef8302269 (patch) | |
| tree | 5f3dc3b70e9b43ee7fd4cedead6a2cf5974e0b00 | |
| parent | 9fffef9f3562e05755e4b3c46509b2eeeb623ff7 (diff) | |
| download | vim-git-f8e9eb8e173bf0ff9560192ae888941ef8302269.tar.gz | |
patch 8.2.3776: when a tags file line is long a tag may not be foundv8.2.3776
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.
| -rw-r--r-- | src/tag.c | 9 | ||||
| -rw-r--r-- | src/testdir/test_taglist.vim | 19 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 28 insertions, 2 deletions
@@ -2011,8 +2011,6 @@ find_tags( eof = vim_fgets(lbuf, lbuf_size, fp); 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); if (search_info.curr_offset == search_info.high_offset) { @@ -2052,7 +2050,10 @@ find_tags( eof = cs_fgets(lbuf, lbuf_size); else #endif + { + search_info.curr_offset = vim_ftell(fp); eof = vim_fgets(lbuf, lbuf_size, fp); + } } while (!eof && vim_isblankline(lbuf)); if (eof) @@ -2294,6 +2295,10 @@ parse_line: lbuf = alloc(lbuf_size); if (lbuf == NULL) 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 // this will try the same thing again, make sure the offset is // different diff --git a/src/testdir/test_taglist.vim b/src/testdir/test_taglist.vim index 58ad56512..3ba5ec094 100644 --- a/src/testdir/test_taglist.vim +++ b/src/testdir/test_taglist.vim @@ -236,4 +236,23 @@ func Test_tag_complete_wildoptions() set tags& 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 diff --git a/src/version.c b/src/version.c index 9bf1fa27c..03dee7ee7 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3776, +/**/ 3775, /**/ 3774, |