mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-19 09:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35723 from zeertzjq/vim-9.1.1754

Browse Source 
vim-patch:partial:9.0.0323,9.1.1754
This commit is contained in:
zeertzjq
2025-09-12 08:05:35 +08:00
committed by GitHub
parent c06f0970b0 ae588c183f
commit 855eede11e
2 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvim/help.c
View File

@@ -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();
} }

56
test/old/testdir/test_help.vim
View File

@@ -144,30 +144,36 @@ endfunc
" Test for the :helptags command " Test for the :helptags command
" NOTE: if you run tests as root this will fail. Don't run tests as root! " NOTE: if you run tests as root this will fail. Don't run tests as root!
func Test_helptag_cmd() func Test_helptag_cmd()
call mkdir('Xdir/a/doc', 'p') call mkdir('Xtagdir/a/doc', 'p')
" No help file to process in the directory " No help file to process in the directory
call assert_fails('helptags Xdir', 'E151:') call assert_fails('helptags Xtagdir', 'E151:')
call writefile([], 'Xdir/a/doc/sample.txt') call writefile([], 'Xtagdir/a/doc/sample.txt')
" Test for ++t argument " Test for ++t argument
helptags ++t Xdir helptags ++t Xtagdir
call assert_equal(["help-tags\ttags\t1"], readfile('Xdir/tags')) call assert_equal(["help-tags\ttags\t1"], readfile('Xtagdir/tags'))
call delete('Xdir/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*',
\ 'Xdir/a/doc/sample.txt') \ '>', ' *notag2*', '<',
helptags Xdir \ '*tag3*', 'Code: >vim', ' *notag3*', 'Code end: *tag4*',
\ '>i3config', ' *notag4*', '<'],
\ 'Xtagdir/a/doc/sample.txt')
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('Xdir/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*'], 'Xdir/a/doc/sample.txt') call writefile(['*tag1*', '*tag1*', '*tag2*'], 'Xtagdir/a/doc/sample.txt')
call assert_fails('helptags Xdir', 'E154:') call assert_fails('helptags Xtagdir', 'E154:')
call delete('Xdir', 'rf') call delete('Xtagdir', 'rf')
endfunc endfunc
func Test_helptag_cmd_readonly() func Test_helptag_cmd_readonly()
@@ -175,25 +181,25 @@ func Test_helptag_cmd_readonly()
CheckNotRoot CheckNotRoot
" Read-only tags file " Read-only tags file
call mkdir('Xdir/doc', 'p') call mkdir('Xrodir/doc', 'p')
call writefile([''], 'Xdir/doc/tags') call writefile([''], 'Xrodir/doc/tags')
call writefile([], 'Xdir/doc/sample.txt') call writefile([], 'Xrodir/doc/sample.txt')
call setfperm('Xdir/doc/tags', 'r-xr--r--') call setfperm('Xrodir/doc/tags', 'r-xr--r--')
call assert_fails('helptags Xdir/doc', 'E152:', getfperm('Xdir/doc/tags')) call assert_fails('helptags Xrodir/doc', 'E152:', getfperm('Xrodir/doc/tags'))
let rtp = &rtp let rtp = &rtp
let &rtp = 'Xdir' let &rtp = 'Xrodir'
helptags ALL helptags ALL
let &rtp = rtp let &rtp = rtp
call delete('Xdir/doc/tags') call delete('Xrodir/doc/tags')
" No permission to read the help file " No permission to read the help file
call mkdir('Xdir/b/doc', 'p') call mkdir('Xrodir/b/doc', 'p')
call writefile([], 'Xdir/b/doc/sample.txt') call writefile([], 'Xrodir/b/doc/sample.txt')
call setfperm('Xdir/b/doc/sample.txt', '-w-------') call setfperm('Xrodir/b/doc/sample.txt', '-w-------')
call assert_fails('helptags Xdir', 'E153:', getfperm('Xdir/b/doc/sample.txt')) call assert_fails('helptags Xrodir', 'E153:', getfperm('Xrodir/b/doc/sample.txt'))
call delete('Xdir', 'rf') call delete('Xrodir', 'rf')
endfunc endfunc
" Test for setting the 'helpheight' option in the help window " Test for setting the 'helpheight' option in the help window