mirror of
https://github.com/vim/vim.git
synced 2025-09-30 04:44:14 -04:00
patch 8.2.4792: indent operator creates an undo entry for every line
Problem: Indent operator creates an undo entry for every line. Solution: Create one undo entry for all lines. (closes #10227)
This commit is contained in:
62
src/indent.c
62
src/indent.c
@@ -1060,40 +1060,44 @@ op_reindent(oparg_T *oap, int (*how)(void))
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = oap->line_count; --i >= 0 && !got_int; )
|
// Save for undo. Do this once for all lines, much faster than doing this
|
||||||
{
|
// for each line separately, especially when undoing.
|
||||||
// it's a slow thing to do, so give feedback so there's no worry that
|
if (u_savecommon(start_lnum - 1, start_lnum + oap->line_count,
|
||||||
// the computer's just hung.
|
start_lnum + oap->line_count, FALSE) == OK)
|
||||||
|
for (i = oap->line_count; --i >= 0 && !got_int; )
|
||||||
if (i > 1
|
|
||||||
&& (i % 50 == 0 || i == oap->line_count - 1)
|
|
||||||
&& oap->line_count > p_report)
|
|
||||||
smsg(_("%ld lines to indent... "), i);
|
|
||||||
|
|
||||||
// Be vi-compatible: For lisp indenting the first line is not
|
|
||||||
// indented, unless there is only one line.
|
|
||||||
# ifdef FEAT_LISP
|
|
||||||
if (i != oap->line_count - 1 || oap->line_count == 1
|
|
||||||
|| how != get_lisp_indent)
|
|
||||||
# endif
|
|
||||||
{
|
{
|
||||||
l = skipwhite(ml_get_curline());
|
// it's a slow thing to do, so give feedback so there's no worry
|
||||||
if (*l == NUL) // empty or blank line
|
// that the computer's just hung.
|
||||||
amount = 0;
|
|
||||||
else
|
|
||||||
amount = how(); // get the indent for this line
|
|
||||||
|
|
||||||
if (amount >= 0 && set_indent(amount, SIN_UNDO))
|
if (i > 1
|
||||||
|
&& (i % 50 == 0 || i == oap->line_count - 1)
|
||||||
|
&& oap->line_count > p_report)
|
||||||
|
smsg(_("%ld lines to indent... "), i);
|
||||||
|
|
||||||
|
// Be vi-compatible: For lisp indenting the first line is not
|
||||||
|
// indented, unless there is only one line.
|
||||||
|
# ifdef FEAT_LISP
|
||||||
|
if (i != oap->line_count - 1 || oap->line_count == 1
|
||||||
|
|| how != get_lisp_indent)
|
||||||
|
# endif
|
||||||
{
|
{
|
||||||
// did change the indent, call changed_lines() later
|
l = skipwhite(ml_get_curline());
|
||||||
if (first_changed == 0)
|
if (*l == NUL) // empty or blank line
|
||||||
first_changed = curwin->w_cursor.lnum;
|
amount = 0;
|
||||||
last_changed = curwin->w_cursor.lnum;
|
else
|
||||||
|
amount = how(); // get the indent for this line
|
||||||
|
|
||||||
|
if (amount >= 0 && set_indent(amount, 0))
|
||||||
|
{
|
||||||
|
// did change the indent, call changed_lines() later
|
||||||
|
if (first_changed == 0)
|
||||||
|
first_changed = curwin->w_cursor.lnum;
|
||||||
|
last_changed = curwin->w_cursor.lnum;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
++curwin->w_cursor.lnum;
|
||||||
|
curwin->w_cursor.col = 0; // make sure it's valid
|
||||||
}
|
}
|
||||||
++curwin->w_cursor.lnum;
|
|
||||||
curwin->w_cursor.col = 0; // make sure it's valid
|
|
||||||
}
|
|
||||||
|
|
||||||
// put cursor on first non-blank of indented line
|
// put cursor on first non-blank of indented line
|
||||||
curwin->w_cursor.lnum = start_lnum;
|
curwin->w_cursor.lnum = start_lnum;
|
||||||
|
@@ -59,6 +59,29 @@ func Test_reindent()
|
|||||||
close!
|
close!
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
" Test indent operator creating one undo entry
|
||||||
|
func Test_indent_operator_undo()
|
||||||
|
enew
|
||||||
|
call setline(1, range(12)->map('"\t" .. v:val'))
|
||||||
|
func FoldExpr()
|
||||||
|
let g:foldcount += 1
|
||||||
|
return '='
|
||||||
|
endfunc
|
||||||
|
set foldmethod=expr foldexpr=FoldExpr()
|
||||||
|
let g:foldcount = 0
|
||||||
|
redraw
|
||||||
|
call assert_equal(12, g:foldcount)
|
||||||
|
normal gg=G
|
||||||
|
call assert_equal(24, g:foldcount)
|
||||||
|
undo
|
||||||
|
call assert_equal(38, g:foldcount)
|
||||||
|
|
||||||
|
bwipe!
|
||||||
|
set foldmethod& foldexpr=
|
||||||
|
delfunc FoldExpr
|
||||||
|
unlet g:foldcount
|
||||||
|
endfunc
|
||||||
|
|
||||||
" Test for shifting a line with a preprocessor directive ('#')
|
" Test for shifting a line with a preprocessor directive ('#')
|
||||||
func Test_preproc_indent()
|
func Test_preproc_indent()
|
||||||
new
|
new
|
||||||
|
@@ -746,6 +746,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 */
|
||||||
|
/**/
|
||||||
|
4792,
|
||||||
/**/
|
/**/
|
||||||
4791,
|
4791,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user