patch 8.2.2761: using "syn include" does not work properly
Problem: Using "syn include" does not work properly.
Solution: Don't add current_syn_inc_tag to topgrp. (Jaehwang Jerry Jung,
closes #8104)
diff --git a/src/syntax.c b/src/syntax.c
index d4ec0d3..c3572d8 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -5990,12 +5990,17 @@
break;
}
if (name[1] == 'A')
- id = SYNID_ALLBUT;
+ id = SYNID_ALLBUT + current_syn_inc_tag;
else if (name[1] == 'T')
- id = SYNID_TOP;
+ {
+ if (curwin->w_s->b_syn_topgrp >= SYNID_CLUSTER)
+ id = curwin->w_s->b_syn_topgrp;
+ else
+ id = SYNID_TOP + current_syn_inc_tag;
+ }
else
- id = SYNID_CONTAINED;
- id += current_syn_inc_tag;
+ id = SYNID_CONTAINED + current_syn_inc_tag;
+
}
else if (name[1] == '@')
{
diff --git a/src/testdir/test_syntax.vim b/src/testdir/test_syntax.vim
index 1a413f6..bc268a1 100644
--- a/src/testdir/test_syntax.vim
+++ b/src/testdir/test_syntax.vim
@@ -920,4 +920,21 @@
bw!
endfunc
+func Test_syn_include_contains_TOP()
+ let l:case = "TOP in included syntax means its group list name"
+ new
+ syntax include @INCLUDED syntax/c.vim
+ syntax region FencedCodeBlockC start=/```c/ end=/```/ contains=@INCLUDED
+
+ call setline(1, ['```c', '#if 0', 'int', '#else', 'int', '#endif', '```' ])
+ let l:expected = ["cCppOutIf2"]
+ eval AssertHighlightGroups(3, 1, l:expected, 1)
+ " cCppOutElse has contains=TOP
+ let l:expected = ["cType"]
+ eval AssertHighlightGroups(5, 1, l:expected, 1, l:case)
+ syntax clear
+ bw!
+endfunc
+
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 4861ba1..5372cb4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2761,
+/**/
2760,
/**/
2759,