RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 12:37:43 +00:00
Code Issues Activity Actions

LibGUI: Fix crash in TextDocument::remove(TextRange)

Browse source 
Oops, we can't be appending substrings of a string we just deleted!

Fix this by building up the new line instead of trying to clear and
append in place. This works out nicely as we now do fewer document view
updates when removing a range. :^)
This commit is contained in:
Andreas Kling 2020-05-17 22:24:52 +02:00
parent 30a3b8333a
commit 6060c7444b
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Libraries/LibGUI/TextDocument.cpp
View file

@ -117,6 +117,12 @@ void TextDocumentLine::clear(TextDocument& document)
document.update_views({}); document.update_views({});
} }
void TextDocumentLine::set_text(TextDocument& document, const Vector<u32> text)
{
m_text = move(text);
document.update_views({});
}
void TextDocumentLine::set_text(TextDocument& document, const StringView& text) void TextDocumentLine::set_text(TextDocument& document, const StringView& text)
{ {
if (text.is_empty()) { if (text.is_empty()) {
@ -132,6 +138,8 @@ void TextDocumentLine::set_text(TextDocument& document, const StringView& text)
void TextDocumentLine::append(TextDocument& document, const u32* codepoints, size_t length) void TextDocumentLine::append(TextDocument& document, const u32* codepoints, size_t length)
{ {
if (length == 0)
return;
m_text.append(codepoints, length); m_text.append(codepoints, length);
document.update_views({}); document.update_views({});
} }
@ -588,9 +596,10 @@ void TextDocument::remove(const TextRange& unnormalized_range)
ASSERT(range.start().line() == range.end().line() - 1); ASSERT(range.start().line() == range.end().line() - 1);
auto& first_line = line(range.start().line()); auto& first_line = line(range.start().line());
auto& second_line = line(range.end().line()); auto& second_line = line(range.end().line());
first_line.clear(*this); Vector<u32> codepoints;
first_line.append(*this, first_line.codepoints(), range.start().column()); codepoints.append(first_line.codepoints(), range.start().column());
first_line.append(*this, second_line.codepoints() + range.end().column(), second_line.length() - range.end().column()); codepoints.append(second_line.codepoints() + range.end().column(), second_line.length() - range.end().column());
first_line.set_text(*this, move(codepoints));
remove_line(range.end().line()); remove_line(range.end().line());
} }

1
Libraries/LibGUI/TextDocument.h
View file

@ -160,6 +160,7 @@ public:
const u32* codepoints() const { return m_text.data(); } const u32* codepoints() const { return m_text.data(); }
size_t length() const { return m_text.size(); } size_t length() const { return m_text.size(); }
void set_text(TextDocument&, const StringView&); void set_text(TextDocument&, const StringView&);
void set_text(TextDocument&, Vector<u32>);
void append(TextDocument&, u32); void append(TextDocument&, u32);
void prepend(TextDocument&, u32); void prepend(TextDocument&, u32);
void insert(TextDocument&, size_t index, u32); void insert(TextDocument&, size_t index, u32);