RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 13:18:13 +00:00
Code Issues Activity Actions

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
7 changed files with 87 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Libraries/LibLine/Editor.h
View file

@ -33,6 +33,7 @@
#include <AK/HashMap.h>
#include <AK/NonnullOwnPtr.h>
#include <AK/QuickSort.h>
#include <AK/Result.h>
#include <AK/String.h>
#include <AK/Utf32View.h>
#include <AK/Utf8View.h>
@ -78,10 +79,16 @@ struct Configuration {
class Editor {
public:
enum class Error {
ReadFailure,
Empty,
Eof,
};
explicit Editor(Configuration configuration = {});
~Editor();
String get_line(const String& prompt);
Result<String, Error> get_line(const String& prompt);
void initialize()
{
@ -209,6 +216,7 @@ private:
set_origin(0, 0);
m_prompt_lines_at_suggestion_initiation = 0;
m_refresh_needed = true;
m_input_error.clear();
}
void refresh_display();
@ -276,8 +284,10 @@ private:
Vector<u32, 1024> m_pre_search_buffer;
Vector<u32, 1024> m_buffer;
Vector<char, 512> m_incomplete_data;
ByteBuffer m_pending_chars;
Vector<char, 512> m_incomplete_data;
Optional<Error> m_input_error;
size_t m_cursor { 0 };
size_t m_drawn_cursor { 0 };
size_t m_inline_search_cursor { 0 };