[FarGroup/FarManager] master: Optimize block Undo in Editor (ac39eb0ad)

[farg...@farmanager.com]

Repository : https://github.com/FarGroup/FarManager
On branch : master
Link : https://github.com/FarGroup/FarManager/commit/ac39eb0ad939d812afa1812d08cfeea18ddb2bc3

>---------------------------------------------------------------

commit ac39eb0ad939d812afa1812d08cfeea18ddb2bc3
Author: Alex Alabuzhev <alab...@gmail.com>
Date: Sat Jan 17 23:14:43 2026 +0000

Optimize block Undo in Editor


>---------------------------------------------------------------

ac39eb0ad939d812afa1812d08cfeea18ddb2bc3
far/editor.cpp | 21 ++++++++++++++++++---
far/editor.hpp | 1 +
2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/far/editor.cpp b/far/editor.cpp
index d486e8779..1bf34fd96 100644
--- a/far/editor.cpp
+++ b/far/editor.cpp
@@ -3757,13 +3757,14 @@ void Editor::DoSearchReplace(const SearchReplaceDisposition Disposition)
if (MsgCode == message_result::first_button || MsgCode == message_result::second_button)
{
Pasting++;
- AddUndoData(undo_type::begin);

// If Replace string doesn't contain control symbols (tab and return),
// processed with fast method, otherwise use improved old one.
//
if (strReplaceStrCurrent.find_first_of(L"\t\r"sv) != string::npos)
{
+ SCOPED_ACTION(undo_block)(this);
+
int SaveOvertypeMode=m_Flags.Check(FEDITOR_OVERTYPE);
m_Flags.Set(FEDITOR_OVERTYPE);
m_it_CurLine->SetOvertypeMode(true);
@@ -3857,7 +3858,6 @@ void Editor::DoSearchReplace(const SearchReplaceDisposition Disposition)
TextChanged(true);
}

- AddUndoData(undo_type::end);
Pasting--;
}
}
@@ -4724,6 +4724,21 @@ void Editor::AddUndoData(undo_type Type, string_view const Str, eol Eol, int Str
}
UndoData.erase(Begin, UndoData.end());

+ switch (Type)
+ {
+ case undo_type::begin:
+ ++m_WithinUndoBlock;
+ break;
+
+ case undo_type::end:
+ assert(m_WithinUndoBlock);
+ --m_WithinUndoBlock;
+ break;
+
+ default:
+ break;
+ }
+
auto PrevUndo=UndoData.end();
if(!UndoData.empty())
{
@@ -4757,7 +4772,7 @@ void Editor::AddUndoData(undo_type Type, string_view const Str, eol Eol, int Str
case undo_type::edit:
{
if (!m_Flags.Check(FEDITOR_NEWUNDO) && PrevUndo->m_Type == undo_type::edit && StrNum == PrevUndo->m_StrNum &&
- (std::abs(StrPos-PrevUndo->m_StrPos)<=1 || abs(StrPos-LastChangeStrPos)<=1))
+ m_WithinUndoBlock || (std::abs(StrPos-PrevUndo->m_StrPos)<=1 || abs(StrPos-LastChangeStrPos)<=1))
{
LastChangeStrPos=StrPos;
return;
diff --git a/far/editor.hpp b/far/editor.hpp
index 86621642d..57f3f868f 100644
--- a/far/editor.hpp
+++ b/far/editor.hpp
@@ -351,6 +351,7 @@ private:
std::list<EditorUndoData> UndoData;
std::list<EditorUndoData>::iterator UndoPos{ UndoData.end() };
std::list<EditorUndoData>::iterator UndoSavePos{ UndoData.end() };
+ size_t m_WithinUndoBlock{};
int UndoSkipLevel{};
int LastChangeStrPos{};
eol GlobalEOL;