mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-04-27 06:48:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibLine: Change get_line to return a Result<String, Error>

Browse source 
This fixes a bunch of FIXME's in LibLine.
Also handles the case where read() would read zero bytes in vt_dsr() and
effectively block forever by erroring out.

Fixes #2370
This commit is contained in:
AnotherTest 2020-05-25 16:57:07 +04:30 • committed by Andreas Kling
parent 1e30ef239b
commit bc9013f706
Notes: sideshowbarker 2024-07-19 06:08:54 +09:00
7 changed files with 87 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Shell/Shell.cpp
View file

@ -1701,19 +1701,29 @@ Vector<Line::CompletionSuggestion> Shell::complete(const Line::Editor& editor)
return suggestions;
}
void Shell::read_single_line()
bool Shell::read_single_line()
{
auto line = editor.get_line(prompt());
auto line_result = editor.get_line(prompt());
if (line_result.is_error()) {
m_complete_line_builder.clear();
m_should_continue = ContinuationRequest::Nothing;
m_should_break_current_command = false;
Core::EventLoop::current().quit(line_result.error() == Line::Editor::Error::Eof ? 0 : 1);
return false;
}
auto& line = line_result.value();
if (m_should_break_current_command) {
m_complete_line_builder.clear();
m_should_continue = ContinuationRequest::Nothing;
m_should_break_current_command = false;
return;
return true;
}
if (line.is_empty())
return;
return true;
// FIXME: This might be a bit counter-intuitive, since we put nothing
// between the two lines, even though the user has pressed enter
@ -1725,17 +1735,18 @@ void Shell::read_single_line()
m_should_continue = complete_or_exit_code.continuation;
if (!complete_or_exit_code.has_value())
return;
return true;
editor.add_to_history(m_complete_line_builder.build());
m_complete_line_builder.clear();
return true;
}
void Shell::custom_event(Core::CustomEvent& event)
{
if (event.custom_type() == ReadLine) {
read_single_line();
Core::EventLoop::current().post_event(*this, make<Core::CustomEvent>(ShellEventType::ReadLine));
if (read_single_line())
Core::EventLoop::current().post_event(*this, make<Core::CustomEvent>(ShellEventType::ReadLine));
return;
}