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

Incsubsitution feature

Browse Source 
Originally implemented by

* Clement0
* DesbyP
* aym7
* Adrey06
* Robinhola

in #4811. Major reworkings and bug
fixes by

* bfredl

Most tests suggested by ZyX-l, suggestions for improvements by oni-link.
This commit is contained in:
KillTheMule
2016-08-12 12:00:36 +02:00
parent 6143cfdeec
commit 13841a56b4
23 changed files with 486 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/nvim/undo.c
View File

@@ -1669,7 +1669,7 @@ void u_undo(int count)
undo_undoes = TRUE;
else
undo_undoes = !undo_undoes;
u_doit(count);
u_doit(count, false);
}
/*
@@ -1678,15 +1678,58 @@ void u_undo(int count)
*/
void u_redo(int count)
{
if (vim_strchr(p_cpo, CPO_UNDO) == NULL)
undo_undoes = FALSE;
u_doit(count);
if (vim_strchr(p_cpo, CPO_UNDO) == NULL) {
undo_undoes = false;
}
u_doit(count, false);
}
/// undo and forget.
bool u_undo_and_forget(int count)
{
if (curbuf->b_u_synced == false) {
u_sync(true);
count = 1;
}
undo_undoes = true;
u_doit(count, true);
if (curbuf->b_u_curhead == NULL) {
// nothing was undone.
return false;
}
// Delete the current redo header
// set the redo header to the next alternative branch (if any)
// otherwise we will be in the leaf state
u_header_T *to_forget = curbuf->b_u_curhead;
curbuf->b_u_newhead = to_forget->uh_next.ptr;
curbuf->b_u_curhead = to_forget->uh_alt_next.ptr;
if (curbuf->b_u_curhead) {
to_forget->uh_alt_next.ptr = NULL;
curbuf->b_u_curhead->uh_alt_prev.ptr = to_forget->uh_alt_prev.ptr;
curbuf->b_u_seq_cur = curbuf->b_u_curhead->uh_seq-1;
} else if (curbuf->b_u_newhead) {
curbuf->b_u_seq_cur = curbuf->b_u_newhead->uh_seq;
}
if (to_forget->uh_alt_prev.ptr) {
to_forget->uh_alt_prev.ptr->uh_alt_next.ptr = curbuf->b_u_curhead;
}
if (curbuf->b_u_newhead) {
curbuf->b_u_newhead->uh_prev.ptr = curbuf->b_u_curhead;
}
if (curbuf->b_u_seq_last == to_forget->uh_seq) {
curbuf->b_u_seq_last--;
}
u_freebranch(curbuf, to_forget, NULL);
return true;
}
/*
* Undo or redo, depending on 'undo_undoes', 'count' times.
*/
static void u_doit(int startcount)
static void u_doit(int startcount, bool quiet)
{
int count = startcount;
@@ -1722,7 +1765,7 @@ static void u_doit(int startcount)
break;
}
u_undoredo(TRUE);
u_undoredo(true);
} else {
if (curbuf->b_u_curhead == NULL || get_undolevel() <= 0) {
beep_flush(); /* nothing to redo */
@@ -1742,7 +1785,7 @@ static void u_doit(int startcount)
curbuf->b_u_curhead = curbuf->b_u_curhead->uh_prev.ptr;
}
}
u_undo_end(undo_undoes, FALSE);
u_undo_end(undo_undoes, false, quiet);
}
/*
@@ -2055,7 +2098,7 @@ void undo_time(long step, int sec, int file, int absolute)
}
}
}
u_undo_end(did_undo, absolute);
u_undo_end(did_undo, absolute, false);
}
/*
@@ -2304,10 +2347,11 @@ static void u_undoredo(int undo)
* Otherwise, report the number of changes (this may be incorrect
* in some cases, but it's better than nothing).
*/
static void
u_undo_end (
int did_undo, /* just did an undo */
int absolute /* used ":undo N" */
static void
u_undo_end(
int did_undo, // just did an undo
int absolute, // used ":undo N"
bool quiet
)
{
char *msgstr;
@@ -2317,9 +2361,11 @@ u_undo_end (
if ((fdo_flags & FDO_UNDO) && KeyTyped)
foldOpenCursor();
if (global_busy /* no messages now, wait until global is finished */
|| !messaging()) /* 'lazyredraw' set, don't do messages now */
if (global_busy // no messages now, wait until global is finished
|| !messaging() // 'lazyredraw' set, don't do messages now
|| quiet) { // livemode doesn't show messages
return;
}
if (curbuf->b_ml.ml_flags & ML_EMPTY)
--u_newcount;