vim-patch:8.2.0365: tag kind can't be a multi-byte character

Problem:    Tag kind can't be a multi-byte character. (Marcin Szamotulski)
Solution:   Recognize multi-byte character. (closes vim/vim#5724)
https://github.com/vim/vim/commit/283e5f4e69b204e0eafd408548e69b7ca9b4871b

2 files changed, 23 insertions, 12 deletions

diff --git a/src/nvim/tag.c b/src/nvim/tag.c
index 57bb43c846..ff07a00952 100644
--- a/src/nvim/tag.c
+++ b/src/nvim/tag.c
@@ -2540,7 +2540,9 @@ parse_match(
       }
       p += 2;  // skip ";\""
       if (*p++ == TAB) {
-        while (ASCII_ISALPHA(*p)) {
+        // Accept ASCII alphabetic kind characters and any multi-byte
+        // character.
+        while (ASCII_ISALPHA(*p) || utfc_ptr2len(p) > 1) {
           if (STRNCMP(p, "kind:", 5) == 0) {
             tagp->tagkind = p + 5;
           } else if (STRNCMP(p, "user_data:", 10) == 0) {
@@ -2559,19 +2561,22 @@ parse_match(
           }
           if (pt == NULL)
             break;
-          p = pt + 1;
+          p = pt;
+          MB_PTR_ADV(p);
         }
       }
     }
     if (tagp->tagkind != NULL) {
       for (p = tagp->tagkind;
-           *p && *p != '\t' && *p != '\r' && *p != '\n'; ++p)
-        ;
+           *p && *p != '\t' && *p != '\r' && *p != '\n';
+           MB_PTR_ADV(p)) {
+      }
       tagp->tagkind_end = p;
     }
     if (tagp->user_data != NULL) {
       for (p = tagp->user_data;
-           *p && *p != '\t' && *p != '\r' && *p != '\n'; p++) {
+           *p && *p != '\t' && *p != '\r' && *p != '\n';
+           MB_PTR_ADV(p)) {
       }
       tagp->user_data_end = p;
     }
@@ -3181,7 +3186,8 @@ int get_tags(list_T *list, char_u *pat, char_u *buf_fname)
 
       if (tp.command_end != NULL) {
         for (char_u *p = tp.command_end + 3;
-             *p != NUL && *p != '\n' && *p != '\r'; p++) {
+             *p != NUL && *p != '\n' && *p != '\r';
+             MB_PTR_ADV(p)) {
           if (p == tp.tagkind
               || (p + 5 == tp.tagkind && STRNCMP(p, "kind:", 5) == 0)) {
             // skip "kind:<kind>" and "<kind>"
diff --git a/src/nvim/testdir/test_taglist.vim b/src/nvim/testdir/test_taglist.vim
index cb54ace695..d4ff42fd68 100644
--- a/src/nvim/testdir/test_taglist.vim
+++ b/src/nvim/testdir/test_taglist.vim
@@ -7,6 +7,7 @@ func Test_taglist()
 	\ "BFoo\tXbar\t1",
 	\ "BBar\tXbar\t2",
 	\ "Kindly\tXbar\t3;\"\tv\tfile:",
+	\ "Lambda\tXbar\t3;\"\tλ\tfile:",
 	\ "Command\tXbar\tcall cursor(3, 4)|;\"\td",
 	\ ], 'Xtags')
   set tags=Xtags
@@ -17,12 +18,16 @@ func Test_taglist()
   call assert_equal(['FFoo', 'BFoo'], map(taglist("Foo", "Xfoo"), {i, v -> v.name}))
   call assert_equal(['BFoo', 'FFoo'], map(taglist("Foo", "Xbar"), {i, v -> v.name}))
 
-  let kind = taglist("Kindly")
-  call assert_equal(1, len(kind))
-  call assert_equal('v', kind[0]['kind'])
-  call assert_equal('3', kind[0]['cmd'])
-  call assert_equal(1, kind[0]['static'])
-  call assert_equal('Xbar', kind[0]['filename'])
+  let kindly = taglist("Kindly")
+  call assert_equal(1, len(kindly))
+  call assert_equal('v', kindly[0]['kind'])
+  call assert_equal('3', kindly[0]['cmd'])
+  call assert_equal(1, kindly[0]['static'])
+  call assert_equal('Xbar', kindly[0]['filename'])
+
+  let lambda = taglist("Lambda")
+  call assert_equal(1, len(lambda))
+  call assert_equal('λ', lambda[0]['kind'])
 
   let cmd = taglist("Command")
   call assert_equal(1, len(cmd))