xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not use diff when reloading a no undo buffer

Browse Source
This commit is contained in:
Maxime Coste 2015-05-14 14:05:02 +01:00
parent cc97d4ba41
commit 8ba6804480
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/buffer.cc
View File

@ -167,6 +167,16 @@ void Buffer::reload(BufferLines lines, time_t fs_timestamp)
commit_undo_group(); commit_undo_group();
if (not record_undo)
{
m_changes.push_back({ Change::Erase, true, {0,0}, line_count() });
static_cast<BufferLines&>(m_lines) = std::move(lines);
m_changes.push_back({ Change::Insert, true, {0,0}, line_count() });
}
else
{
auto diff = find_diff(m_lines.begin(), m_lines.size(), auto diff = find_diff(m_lines.begin(), m_lines.size(),
lines.begin(), (int)lines.size(), lines.begin(), (int)lines.size(),
[](const StringDataPtr& lhs, const StringDataPtr& rhs) [](const StringDataPtr& lhs, const StringDataPtr& rhs)
@ -175,36 +185,31 @@ void Buffer::reload(BufferLines lines, time_t fs_timestamp)
auto it = m_lines.begin(); auto it = m_lines.begin();
for (auto& d : diff) for (auto& d : diff)
{ {
switch (d.mode) if (d.mode == Diff::Keep)
{ it += d.len;
case Diff::Keep: it += d.len; break; else if (d.mode == Diff::Add)
case Diff::Add:
{ {
const LineCount cur_line = (int)(it - m_lines.begin()); const LineCount cur_line = (int)(it - m_lines.begin());
if (record_undo)
{
for (LineCount line = 0; line < d.len; ++line) for (LineCount line = 0; line < d.len; ++line)
m_current_undo_group.emplace_back( m_current_undo_group.emplace_back(
Modification::Insert, cur_line + line, Modification::Insert, cur_line + line,
SharedString{lines[(int)(d.posB + line)]}); SharedString{lines[(int)(d.posB + line)]});
}
m_changes.push_back({ Change::Insert, it == m_lines.end(), cur_line, cur_line + d.len }); m_changes.push_back({ Change::Insert, it == m_lines.end(), cur_line, cur_line + d.len });
it = m_lines.insert(it, &lines[d.posB], &lines[d.posB + d.len]) + d.len; it = m_lines.insert(it, &lines[d.posB], &lines[d.posB + d.len]) + d.len;
break;
} }
case Diff::Remove: else if (d.mode == Diff::Remove)
{ {
const LineCount cur_line = (int)(it - m_lines.begin()); const LineCount cur_line = (int)(it - m_lines.begin());
if (record_undo)
{
for (LineCount line = d.len-1; line >= 0; --line) for (LineCount line = d.len-1; line >= 0; --line)
m_current_undo_group.emplace_back( m_current_undo_group.emplace_back(
Modification::Erase, cur_line + line, Modification::Erase, cur_line + line,
SharedString{m_lines.get_storage(cur_line + line)}); SharedString{m_lines.get_storage(cur_line + line)});
}
it = m_lines.erase(it, it + d.len); it = m_lines.erase(it, it + d.len);
m_changes.push_back({ Change::Erase, it == m_lines.end(), cur_line, cur_line + d.len }); m_changes.push_back({ Change::Erase, it == m_lines.end(), cur_line, cur_line + d.len });
break;
} }
} }
} }