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

add undo unit_test and fix Buffer

Browse Source
This commit is contained in:
Maxime Coste 2013-01-23 14:27:21 +01:00
parent 3404366b65
commit 72cc61c987
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/buffer.cc
View File

@ -272,7 +272,7 @@ void Buffer::do_insert(const BufferIterator& pos, const String& content)
if (start != content.length()) if (start != content.length())
m_lines.push_back({ offset + start, content.substr(start) }); m_lines.push_back({ offset + start, content.substr(start) });
begin_it = pos; begin_it = BufferIterator{*this, { pos.line() + 1, 0 }};
end_it = end(); end_it = end();
} }
else else
@ -349,8 +349,14 @@ void Buffer::do_erase(const BufferIterator& begin, const BufferIterator& end)
void Buffer::apply_modification(const Modification& modification) void Buffer::apply_modification(const Modification& modification)
{ {
const String& content = modification.content; const String& content = modification.content;
const BufferIterator& pos = modification.position; BufferIterator pos = modification.position;
// this may happen when a modification applied at the
// end of the buffer has been inverted for an undo.
if (pos.column() == m_lines[pos.line()].length())
pos = { pos.buffer(), { pos.line() + 1, 0 }};
assert(pos.is_valid());
switch (modification.type) switch (modification.type)
{ {
case Modification::Insert: case Modification::Insert:

9
src/unit_tests.cc
View File

@ -38,6 +38,15 @@ void test_buffer()
begin = buffer.end() - 1; begin = buffer.end() - 1;
buffer.insert(buffer.end(), "kanaky\n"); buffer.insert(buffer.end(), "kanaky\n");
assert(buffer.string(begin+1, buffer.end()) == "kanaky\n"); assert(buffer.string(begin+1, buffer.end()) == "kanaky\n");
buffer.end_undo_group();
buffer.begin_undo_group();
buffer.erase(begin+1, buffer.end());
buffer.insert(buffer.end(), "mutch\n");
buffer.end_undo_group();
buffer.undo();
assert(buffer.string(buffer.end() - 7, buffer.end()) == "kanaky\n");
} }
void test_editor() void test_editor()