aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.2.2011: "syn sync" reports a very large number

Browse Source 
Problem:    "syn sync" reports a very large number.
Solution:   Use "at the first line".
This commit is contained in:
Bram Moolenaar
2020-11-18 16:53:23 +01:00
parent 8e02faf4e9
commit 9950280d37
3 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/syntax.c
View File

@@ -3869,9 +3869,14 @@ syn_cmd_list(
msg_puts(_("no syncing")); msg_puts(_("no syncing"));
else else
{ {
msg_puts(_("syncing starts ")); if (curwin->w_s->b_syn_sync_minlines == MAXLNUM)
msg_outnum(curwin->w_s->b_syn_sync_minlines); msg_puts(_("syncing starts at the first line"));
msg_puts(_(" lines before top line")); else
{
msg_puts(_("syncing starts "));
msg_outnum(curwin->w_s->b_syn_sync_minlines);
msg_puts(_(" lines before top line"));
}
syn_match_msg(); syn_match_msg();
} }
return; return;
@@ -3935,19 +3940,24 @@ syn_lines_msg(void)
|| curwin->w_s->b_syn_sync_minlines > 0) || curwin->w_s->b_syn_sync_minlines > 0)
{ {
msg_puts("; "); msg_puts("; ");
if (curwin->w_s->b_syn_sync_minlines > 0) if (curwin->w_s->b_syn_sync_minlines == MAXLNUM)
msg_puts(_("from the first line"));
else
{ {
msg_puts(_("minimal ")); if (curwin->w_s->b_syn_sync_minlines > 0)
msg_outnum(curwin->w_s->b_syn_sync_minlines); {
if (curwin->w_s->b_syn_sync_maxlines) msg_puts(_("minimal "));
msg_puts(", "); msg_outnum(curwin->w_s->b_syn_sync_minlines);
if (curwin->w_s->b_syn_sync_maxlines)
msg_puts(", ");
}
if (curwin->w_s->b_syn_sync_maxlines > 0)
{
msg_puts(_("maximal "));
msg_outnum(curwin->w_s->b_syn_sync_maxlines);
}
msg_puts(_(" lines before top line"));
} }
if (curwin->w_s->b_syn_sync_maxlines > 0)
{
msg_puts(_("maximal "));
msg_outnum(curwin->w_s->b_syn_sync_maxlines);
}
msg_puts(_(" lines before top line"));
} }
} }

3
src/testdir/test_syntax.vim
View File

@@ -316,6 +316,8 @@ func Test_syntax_arg_skipped()
syn sync ccomment syn sync ccomment
endif endif
call assert_notmatch('on C-style comments', execute('syntax sync')) call assert_notmatch('on C-style comments', execute('syntax sync'))
syn sync fromstart
call assert_match('syncing starts at the first line', execute('syntax sync'))
syn clear syn clear
endfunc endfunc
@@ -735,6 +737,7 @@ func Test_syntax_foldlevel()
redir END redir END
call assert_equal("\nsyntax foldlevel start", @c) call assert_equal("\nsyntax foldlevel start", @c)
syn sync fromstart syn sync fromstart
call assert_match('from the first line$', execute('syn sync'))
let a = map(range(3,9), 'foldclosed(v:val)') let a = map(range(3,9), 'foldclosed(v:val)')
call assert_equal([3,3,3,3,3,3,3], a) " attached cascade folds together call assert_equal([3,3,3,3,3,3,3], a) " attached cascade folds together
let a = map(range(10,15), 'foldclosed(v:val)') let a = map(range(10,15), 'foldclosed(v:val)')

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2011,
/**/ /**/
2010, 2010,
/**/ /**/