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

Make Buffer::Modification an aggregate

Browse Source
This commit is contained in:
Maxime Coste 2017-09-01 17:31:37 +07:00
parent 5c5491405e
commit e66a5c78ad
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/buffer.cc
View File

@ -220,9 +220,6 @@ struct Buffer::Modification
BufferCoord coord; BufferCoord coord;
StringDataPtr content; StringDataPtr content;
Modification(Type type, BufferCoord coord, StringDataPtr content)
: type(type), coord(coord), content(std::move(content)) {}
Modification inverse() const Modification inverse() const
{ {
return {type == Insert ? Erase : Insert, coord, content}; return {type == Insert ? Erase : Insert, coord, content};
@ -268,9 +265,9 @@ void Buffer::reload(StringView data, timespec fs_timestamp)
const LineCount cur_line = (int)(it - m_lines.begin()); const LineCount cur_line = (int)(it - m_lines.begin());
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.push_back({
Modification::Insert, cur_line + line, Modification::Insert, cur_line + line,
parsed_lines.lines[(int)(d.posB + line)]); parsed_lines.lines[(int)(d.posB + line)]});
m_changes.push_back({ Change::Insert, cur_line, cur_line + d.len }); m_changes.push_back({ Change::Insert, cur_line, cur_line + d.len });
m_lines.insert(it, &parsed_lines.lines[d.posB], &parsed_lines.lines[d.posB + d.len]); m_lines.insert(it, &parsed_lines.lines[d.posB], &parsed_lines.lines[d.posB + d.len]);
@ -281,9 +278,9 @@ void Buffer::reload(StringView data, timespec fs_timestamp)
const LineCount cur_line = (int)(it - m_lines.begin()); const LineCount cur_line = (int)(it - m_lines.begin());
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.push_back({
Modification::Erase, cur_line + line, Modification::Erase, cur_line + line,
m_lines.get_storage(cur_line + line)); 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, cur_line, cur_line + d.len }); m_changes.push_back({ Change::Erase, cur_line, cur_line + d.len });
@ -563,7 +560,7 @@ BufferCoord Buffer::insert(BufferCoord pos, StringView content)
// than one past last char coord. // than one past last char coord.
auto coord = is_end(pos) ? line_count() : pos; auto coord = is_end(pos) ? line_count() : pos;
if (not (m_flags & Flags::NoUndo)) if (not (m_flags & Flags::NoUndo))
m_current_undo_group.emplace_back(Modification::Insert, coord, real_content); m_current_undo_group.push_back({Modification::Insert, coord, real_content});
return do_insert(pos, real_content->strview()); return do_insert(pos, real_content->strview());
} }
@ -579,8 +576,8 @@ BufferCoord Buffer::erase(BufferCoord begin, BufferCoord end)
return begin; return begin;
if (not (m_flags & Flags::NoUndo)) if (not (m_flags & Flags::NoUndo))
m_current_undo_group.emplace_back(Modification::Erase, begin, m_current_undo_group.push_back({Modification::Erase, begin,
intern(string(begin, end))); intern(string(begin, end))});
return do_erase(begin, end); return do_erase(begin, end);
} }