mirror of
https://github.com/neovim/neovim.git
synced 2025-09-15 15:58:17 +00:00
vim-patch:9.1.1754: :helptags doesn't skip examples with syntax
Problem: :helptags doesn't skip examples with syntax
(Evgeni Chasnovski)
Solution: Check for examples with syntax (zeertzjq).
fixes: vim/vim#18273
closes: vim/vim#18277
6f020cde56
This commit is contained in:
@@ -939,10 +939,15 @@ static void helptags_one(char *dir, const char *ext, const char *tagfname, bool
|
|||||||
}
|
}
|
||||||
p1 = p2;
|
p1 = p2;
|
||||||
}
|
}
|
||||||
size_t len = strlen(IObuff);
|
size_t off = strlen(IObuff);
|
||||||
if ((len == 2 && strcmp(&IObuff[len - 2], ">\n") == 0)
|
if (off >= 2 && IObuff[off - 1] == '\n') {
|
||||||
|| (len >= 3 && strcmp(&IObuff[len - 3], " >\n") == 0)) {
|
off -= 2;
|
||||||
in_example = true;
|
while (off > 0 && (ASCII_ISLOWER(IObuff[off]) || ascii_isdigit(IObuff[off]))) {
|
||||||
|
off--;
|
||||||
|
}
|
||||||
|
if (IObuff[off] == '>' && (off == 0 || IObuff[off - 1] == ' ')) {
|
||||||
|
in_example = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
line_breakcheck();
|
line_breakcheck();
|
||||||
}
|
}
|
||||||
|
@@ -157,11 +157,17 @@ func Test_helptag_cmd()
|
|||||||
call delete('Xtagdir/tags')
|
call delete('Xtagdir/tags')
|
||||||
|
|
||||||
" Test parsing tags
|
" Test parsing tags
|
||||||
call writefile(['*tag1*', 'Example: >', ' *notag*', 'Example end: *tag2*'],
|
call writefile(['*tag1*', 'Example: >', ' *notag1*', 'Example end: *tag2*',
|
||||||
|
\ '>', ' *notag2*', '<',
|
||||||
|
\ '*tag3*', 'Code: >vim', ' *notag3*', 'Code end: *tag4*',
|
||||||
|
\ '>i3config', ' *notag4*', '<'],
|
||||||
\ 'Xtagdir/a/doc/sample.txt')
|
\ 'Xtagdir/a/doc/sample.txt')
|
||||||
helptags Xtagdir
|
helptags Xtagdir
|
||||||
call assert_equal(["tag1\ta/doc/sample.txt\t/*tag1*",
|
call assert_equal(["tag1\ta/doc/sample.txt\t/*tag1*",
|
||||||
\ "tag2\ta/doc/sample.txt\t/*tag2*"], readfile('Xtagdir/tags'))
|
\ "tag2\ta/doc/sample.txt\t/*tag2*",
|
||||||
|
\ "tag3\ta/doc/sample.txt\t/*tag3*",
|
||||||
|
\ "tag4\ta/doc/sample.txt\t/*tag4*"],
|
||||||
|
\ readfile('Xtagdir/tags'))
|
||||||
|
|
||||||
" Duplicate tags in the help file
|
" Duplicate tags in the help file
|
||||||
call writefile(['*tag1*', '*tag1*', '*tag2*'], 'Xtagdir/a/doc/sample.txt')
|
call writefile(['*tag1*', '*tag1*', '*tag2*'], 'Xtagdir/a/doc/sample.txt')
|
||||||
|
Reference in New Issue
Block a user