To: vim_dev@googlegroups.com
Subject: Patch 8.2.0998
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.0998
Problem:    Not all tag code is tested.
Solution:   Add a few more test cases. (Yegappan Lakshmanan, closes #6284)
Files:      src/testdir/test_tagjump.vim


*** ../vim-8.2.0997/src/testdir/test_tagjump.vim	2020-06-10 17:13:39.889204359 +0200
--- src/testdir/test_tagjump.vim	2020-06-17 22:55:37.828641157 +0200
***************
*** 263,270 ****
--- 263,314 ----
    ta foo
    call assert_equal('void foo() {}', getline('.'))
  
+   " Test for including another tags file
+   call writefile([
+         \ "\x0c",
+         \ "Xmain.c,64",
+         \ "void foo() {}\x7ffoo\x011,0",
+         \ "\x0c",
+         \ "Xnonexisting,include",
+         \ "\x0c",
+         \ "Xtags2,include"
+         \ ], 'Xtags')
+   call writefile([
+         \ "\x0c",
+         \ "Xmain.c,64",
+         \ "int main(int argc, char **argv)\x7fmain\x012,14",
+         \ ], 'Xtags2')
+   tag main
+   call assert_equal(2, line('.'))
+ 
+   " corrupted tag line
+   call writefile([
+         \ "\x0c",
+         \ "Xmain.c,8",
+         \ "int main"
+         \ ], 'Xtags', 'b')
+   call assert_fails('tag foo', 'E426:')
+ 
+   " invalid line number
+   call writefile([
+ 	\ "\x0c",
+         \ "Xmain.c,64",
+         \ "void foo() {}\x7ffoo\x0abc,0",
+ 	\ ], 'Xtags')
+   call assert_fails('tag foo', 'E426:')
+ 
+   " invalid tag name
+   call writefile([
+ 	\ "\x0c",
+         \ "Xmain.c,64",
+         \ ";;;;\x7f1,0",
+ 	\ ], 'Xtags')
+   call assert_fails('tag foo', 'E426:')
+ 
    call delete('Xtags')
+   call delete('Xtags2')
    call delete('Xmain.c')
+   set tags&
    bwipe!
  endfunc
  
***************
*** 1268,1271 ****
--- 1312,1340 ----
    close!
  endfunc
  
+ " Test for the 'taglength' option
+ func Test_tag_length()
+   set tags=Xtags
+   call writefile(["!_TAG_FILE_ENCODING\tutf-8\t//",
+         \ "tame\tXfile1\t1;",
+         \ "tape\tXfile2\t1;"], 'Xtags')
+   call writefile(['tame'], 'Xfile1')
+   call writefile(['tape'], 'Xfile2')
+ 
+   " Jumping to the tag 'tape', should instead jump to 'tame'
+   new
+   set taglength=2
+   tag tape
+   call assert_equal('Xfile1', @%)
+   " Tag search should jump to the right tag
+   enew
+   tag /^tape$
+   call assert_equal('Xfile2', @%)
+ 
+   call delete('Xtags')
+   call delete('Xfile1')
+   call delete('Xfile2')
+   set tags& taglength&
+ endfunc
+ 
  " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.0997/src/version.c	2020-06-17 21:47:19.912798036 +0200
--- src/version.c	2020-06-17 22:56:43.684530227 +0200
***************
*** 756,757 ****
--- 756,759 ----
  {   /* Add new patch number below this line */
+ /**/
+     998,
  /**/

-- 
FATHER: We are here today to witness the union of two young people in the
        joyful bond of the holy wedlock.  Unfortunately, one of them, my son
        Herbert, has just fallen to his death.
   [Murmurs from CROWD;  the BRIDE smiles with relief, coughs.]
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///