RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 23:28:12 +00:00
Code Issues Activity Actions

SQLStudio: Save and load blank files without failing assertion

Browse source
This commit is contained in:
ne0ndrag0n 2022-09-21 23:14:19 -04:00 • committed by Sam Atkins
parent 5294fd671e
commit d463b8e6fb
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/DevTools/SQLStudio/ScriptEditor.cpp
View file

@ -29,11 +29,7 @@ void ScriptEditor::new_script_with_temp_name(String name)
ErrorOr<void> ScriptEditor::open_script_from_file(LexicalPath const& file_path) ErrorOr<void> ScriptEditor::open_script_from_file(LexicalPath const& file_path)
{ {
auto file = TRY(Core::Stream::File::open(file_path.string(), Core::Stream::OpenMode::Read)); auto file = TRY(Core::Stream::File::open(file_path.string(), Core::Stream::OpenMode::Read));
auto file_size = TRY(file->size()); auto buffer = TRY(file->read_all());
auto buffer = TRY(ByteBuffer::create_uninitialized(file_size));
if (!file->read_or_error(buffer))
return Error::from_string_literal("Failed to read from file");
set_text({ buffer.bytes() }); set_text({ buffer.bytes() });
m_path = file_path.string(); m_path = file_path.string();
@ -47,7 +43,8 @@ ErrorOr<bool> ScriptEditor::save()
return save_as(); return save_as();
auto file = TRY(Core::Stream::File::open(m_path, Core::Stream::OpenMode::Write)); auto file = TRY(Core::Stream::File::open(m_path, Core::Stream::OpenMode::Write));
if (!file->write_or_error(text().bytes())) auto editor_text = text();
if (editor_text.length() && !file->write_or_error(editor_text.bytes()))
return Error::from_string_literal("Failed to write to file"); return Error::from_string_literal("Failed to write to file");
document().set_unmodified(); document().set_unmodified();
@ -62,7 +59,8 @@ ErrorOr<bool> ScriptEditor::save_as()
auto save_path = maybe_save_path.release_value(); auto save_path = maybe_save_path.release_value();
auto file = TRY(Core::Stream::File::open(save_path, Core::Stream::OpenMode::Write)); auto file = TRY(Core::Stream::File::open(save_path, Core::Stream::OpenMode::Write));
if (!file->write_or_error(text().bytes())) auto editor_text = text();
if (editor_text.length() && !file->write_or_error(editor_text.bytes()))
return Error::from_string_literal("Failed to write to file"); return Error::from_string_literal("Failed to write to file");
m_path = save_path; m_path = save_path;