Mercurial > vim
changeset 24442:d16a69f718b5 v8.2.2761
patch 8.2.2761: using "syn include" does not work properly
Commit: https://github.com/vim/vim/commit/2e240bd428c0033d16f201d7f837636412358199
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Apr 14 11:15:08 2021 +0200
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 14 Apr 2021 11:30:05 +0200 |
| parents | 3f01d9575ab2 |
| children | 0b9b802e2202 |
| files | src/syntax.c src/testdir/test_syntax.vim src/version.c |
| diffstat | 3 files changed, 28 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/syntax.c +++ b/src/syntax.c @@ -5990,12 +5990,17 @@ get_id_list( 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] == '@') {
--- a/src/testdir/test_syntax.vim +++ b/src/testdir/test_syntax.vim @@ -920,4 +920,21 @@ func Test_syn_contained_transparent() 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