IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3776: when a tags file line is long a tag may not be found (#21099)

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.

f8e9eb8e17

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq 2022-11-18 11:16:11 +08:00 committed by GitHub
parent ba04fffe98
commit 282cbc2350
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/tag.c
View File

@ -1691,8 +1691,6 @@ int find_tags(char *pat, int *num_matches, char ***matchesp, int flags, int minc
vim_fseek(fp, search_info.curr_offset, SEEK_SET); vim_fseek(fp, search_info.curr_offset, SEEK_SET);
eof = vim_fgets((char_u *)lbuf, lbuf_size, fp); eof = vim_fgets((char_u *)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) {
// oops, gone a bit too far; try from low offset // oops, gone a bit too far; try from low offset
@ -1718,6 +1716,7 @@ int find_tags(char *pat, int *num_matches, char ***matchesp, int flags, int minc
// skip empty and blank lines // skip empty and blank lines
do { do {
search_info.curr_offset = vim_ftell(fp);
eof = vim_fgets((char_u *)lbuf, lbuf_size, fp); eof = vim_fgets((char_u *)lbuf, lbuf_size, fp);
} while (!eof && vim_isblankline(lbuf)); } while (!eof && vim_isblankline(lbuf));
@ -1840,6 +1839,11 @@ parse_line:
lbuf_size *= 2; lbuf_size *= 2;
xfree(lbuf); xfree(lbuf);
lbuf = xmalloc((size_t)lbuf_size); lbuf = xmalloc((size_t)lbuf_size);
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);
}
// 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
search_info.curr_offset = 0; search_info.curr_offset = 0;

19
src/nvim/testdir/test_taglist.vim
View File

@ -241,4 +241,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