Fix replacing last eol with a single eol
This commit is contained in:
parent
f41d78083a
commit
475e8849a1
|
@ -584,7 +584,10 @@ BufferCoord Buffer::erase(BufferCoord begin, BufferCoord end)
|
|||
BufferCoord Buffer::replace(BufferCoord begin, BufferCoord end, StringView content)
|
||||
{
|
||||
if (is_end(end) and not content.empty() and content.back() == '\n')
|
||||
{
|
||||
end = back_coord();
|
||||
content = content.substr(0, content.length() - 1);
|
||||
}
|
||||
|
||||
auto pos = erase(begin, end);
|
||||
return insert(pos, content);
|
||||
|
|
|
@ -404,6 +404,7 @@ void SelectionList::insert(ConstArrayView<String> strings, InsertMode mode,
|
|||
replace(*m_buffer, sel, str)
|
||||
: m_buffer->insert(changes_tracker.get_new_coord(insert_pos[index]), str);
|
||||
|
||||
size_t old_timestamp = m_timestamp;
|
||||
changes_tracker.update(*m_buffer, m_timestamp);
|
||||
|
||||
if (out_insert_pos)
|
||||
|
@ -411,16 +412,16 @@ void SelectionList::insert(ConstArrayView<String> strings, InsertMode mode,
|
|||
|
||||
if (mode == InsertMode::Replace)
|
||||
{
|
||||
if (str.empty())
|
||||
auto changes = m_buffer->changes_since(old_timestamp);
|
||||
if (changes.size() < 2) // Nothing got inserted, either str was empty, or just \n at end of buffer
|
||||
sel.anchor() = sel.cursor() = m_buffer->clamp(pos);
|
||||
else
|
||||
{
|
||||
// we want min and max from *before* we do any change
|
||||
auto& min = sel.min();
|
||||
auto& max = sel.max();
|
||||
auto& change = m_buffer->changes_since(0).back();
|
||||
min = change.begin;
|
||||
max = m_buffer->char_prev(change.end);
|
||||
min = changes.back().begin;
|
||||
max = m_buffer->char_prev(changes.back().end);
|
||||
}
|
||||
}
|
||||
else if (not str.empty())
|
||||
|
|
1
test/regression/0-replace-last-eol-with-eol/cmd
Normal file
1
test/regression/0-replace-last-eol-with-eol/cmd
Normal file
|
@ -0,0 +1 @@
|
|||
yjR
|
2
test/regression/0-replace-last-eol-with-eol/in
Normal file
2
test/regression/0-replace-last-eol-with-eol/in
Normal file
|
@ -0,0 +1,2 @@
|
|||
|
||||
|
2
test/regression/0-replace-last-eol-with-eol/out
Normal file
2
test/regression/0-replace-last-eol-with-eol/out
Normal file
|
@ -0,0 +1,2 @@
|
|||
|
||||
|
Loading…
Reference in New Issue
Block a user