changeset 16190:d863beec391a v8.1.1100

patch 8.1.1100: tag file without trailing newline no longer works commit https://github.com/vim/vim/commit/fd700393becfc35b6fad305221265b87a8564ddb Author: Bram Moolenaar <Bram@vim.org> Date: Tue Apr 2 21:26:07 2019 +0200 patch 8.1.1100: tag file without trailing newline no longer works Problem: Tag file without trailing newline no longer works. (Marco Hinz) Solution: Don't expect a newline at the end of the file. (closes https://github.com/vim/vim/issues/4200)
author Bram Moolenaar <Bram@vim.org>
date Tue, 02 Apr 2019 21:30:05 +0200
parents 93326d9e3107
children 3477809e8e7f
files src/tag.c src/testdir/test_taglist.vim src/version.c
diffstat 3 files changed, 20 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/tag.c
+++ b/src/tag.c
@@ -1943,14 +1943,16 @@ line_read_in:
 	    }
 
 parse_line:
-	    if (vim_strchr(lbuf, NL) == NULL
+	    // When the line is too long the NUL will not be in the
+	    // last-but-one byte (see vim_fgets()).
+	    // Has been reported for Mozilla JS with extremely long names.
+	    // In that case we can't parse it and we ignore the line.
+	    if (lbuf[LSIZE - 2] != NUL
 #ifdef FEAT_CSCOPE
 					     && !use_cscope
 #endif
 					     )
 	    {
-		// Truncated line, ignore it.  Has been reported for
-		// Mozilla JS with extremely long names.
 		if (p_verbose >= 5)
 		{
 		    verbose_enter();
--- a/src/testdir/test_taglist.vim
+++ b/src/testdir/test_taglist.vim
@@ -98,3 +98,16 @@ func Test_tagfiles()
   call delete('Xtags2')
   bd
 endfunc
+
+" For historical reasons we support a tags file where the last line is missing
+" the newline.
+func Test_tagsfile_without_trailing_newline()
+  call writefile(["Foo\tfoo\t1"], 'Xtags', 'b')
+  set tags=Xtags
+
+  let tl = taglist('.*')
+  call assert_equal(1, len(tl))
+  call assert_equal('Foo', tl[0].name)
+
+  call delete('Xtags')
+endfunc
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1100,
+/**/
     1099,
 /**/
     1098,