IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18682 from zeertzjq/vim-8.1.0535

Browse Source 
vim-patch:8.1.0535,8.2.4991: increment/decrement might get interrupted by updating folds
This commit is contained in:
zeertzjq 2022-05-22 07:27:26 +08:00 committed by GitHub
commit f0717ffade
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/fold.c
View File

@ -775,7 +775,7 @@ void clearFolding(win_T *win)
/// The changes in lines from top to bot (inclusive).
void foldUpdate(win_T *wp, linenr_T top, linenr_T bot)
{
if (compl_busy || State & MODE_INSERT) {
if (disable_fold_update || compl_busy || State & MODE_INSERT) {
return;
}

1
src/nvim/fold.h
View File

@ -23,6 +23,7 @@ typedef struct foldinfo {
#define FOLDINFO_INIT { 0, 0, 0, 0 }
EXTERN int disable_fold_update INIT(= 0);
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "fold.h.generated.h"

10
src/nvim/ops.c
View File

@ -4911,12 +4911,19 @@ void op_addsub(oparg_T *oap, linenr_T Prenum1, bool g_cmd)
ssize_t change_cnt = 0;
linenr_T amount = Prenum1;
// do_addsub() might trigger re-evaluation of 'foldexpr' halfway, when the
// buffer is not completly updated yet. Postpone updating folds until before
// the call to changed_lines().
disable_fold_update++;
if (!VIsual_active) {
pos = curwin->w_cursor;
if (u_save_cursor() == FAIL) {
disable_fold_update--;
return;
}
change_cnt = do_addsub(oap->op_type, &pos, 0, amount);
disable_fold_update--;
if (change_cnt) {
changed_lines(pos.lnum, 0, pos.lnum + 1, 0L, true);
}
@ -4927,6 +4934,7 @@ void op_addsub(oparg_T *oap, linenr_T Prenum1, bool g_cmd)
if (u_save((linenr_T)(oap->start.lnum - 1),
(linenr_T)(oap->end.lnum + 1)) == FAIL) {
disable_fold_update--;
return;
}
@ -4973,6 +4981,8 @@ void op_addsub(oparg_T *oap, linenr_T Prenum1, bool g_cmd)
amount += Prenum1;
}
}
disable_fold_update--;
if (change_cnt) {
changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L, true);
}

20
src/nvim/testdir/test_fold.vim
View File

@ -217,6 +217,26 @@ func Test_update_folds_expr_read()
set foldmethod& foldexpr&
endfunc
" Test for what patch 8.1.0535 fixes.
func Test_foldexpr_no_interrupt_addsub()
new
func! FoldFunc()
call setpos('.', getcurpos())
return '='
endfunc
set foldmethod=expr
set foldexpr=FoldFunc()
call setline(1, '1.2')
exe "norm! $\<C-A>"
call assert_equal('1.3', getline(1))
bwipe!
delfunc FoldFunc
set foldmethod& foldexpr&
endfunc
func Check_foldlevels(expected)
call assert_equal(a:expected, map(range(1, line('$')), 'foldlevel(v:val)'))
endfunc