RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 15:07:45 +00:00
Code Issues Activity Actions

Ladybird+LibWebView: Move console history tracking to ConsoleClient

Browse source 
This will allow other chromes to make use of history in their console
implementations.
This commit is contained in:
Timothy Flynn 2023-08-30 08:45:26 -04:00 • committed by Andrew Kaster
parent ed315dd950
commit 204a6f9241
6 changed files with 69 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Ladybird/Qt/ConsoleWidget.cpp
View file

@ -58,6 +58,16 @@ ConsoleWidget::ConsoleWidget(WebContentView& content_view)
ConsoleWidget::~ConsoleWidget() = default;
Optional<String> ConsoleWidget::previous_history_item()
{
return m_console_client->previous_history_item();
}
Optional<String> ConsoleWidget::next_history_item()
{
return m_console_client->next_history_item();
}
void ConsoleWidget::reset()
{
m_console_client->reset();
@ -66,38 +76,22 @@ void ConsoleWidget::reset()
void ConsoleInputEdit::keyPressEvent(QKeyEvent* event)
{
switch (event->key()) {
case Qt::Key_Down: {
if (m_history.is_empty())
break;
auto last_index = m_history.size() - 1;
if (m_history_index < last_index) {
m_history_index++;
setText(qstring_from_ak_deprecated_string(m_history.at(m_history_index)));
} else if (m_history_index == last_index) {
m_history_index++;
clear();
}
break;
}
case Qt::Key_Up:
if (m_history_index > 0) {
m_history_index--;
setText(qstring_from_ak_deprecated_string(m_history.at(m_history_index)));
}
if (auto script = m_console_widget.previous_history_item(); script.has_value())
setText(qstring_from_ak_string(*script));
break;
case Qt::Key_Down:
if (auto script = m_console_widget.next_history_item(); script.has_value())
setText(qstring_from_ak_string(*script));
break;
case Qt::Key_Return: {
auto js_source = ak_deprecated_string_from_qstring(text());
if (js_source.is_whitespace())
auto js_source = MUST(ak_string_from_qstring(text()));
if (js_source.bytes_as_string_view().is_whitespace())
return;
if (m_history.is_empty() || m_history.last() != js_source) {
m_history.append(js_source);
m_history_index = m_history.size();
}
m_console_widget.client().execute(js_source);
m_console_widget.client().execute(std::move(js_source));
clear();
break;

6
Ladybird/Qt/ConsoleWidget.h
View file

@ -11,7 +11,6 @@
#include <AK/DeprecatedString.h>
#include <AK/OwnPtr.h>
#include <AK/Vector.h>
#include <LibWebView/Forward.h>
#include <QLineEdit>
#include <QWidget>
@ -26,6 +25,9 @@ public:
explicit ConsoleWidget(WebContentView& content_view);
virtual ~ConsoleWidget();
Optional<String> previous_history_item();
Optional<String> next_history_item();
WebView::ConsoleClient& client() { return *m_console_client; }
WebContentView& view() { return *m_output_view; }
@ -51,8 +53,6 @@ private:
virtual void keyPressEvent(QKeyEvent* event) override;
ConsoleWidget& m_console_widget;
Vector<DeprecatedString> m_history;
size_t m_history_index { 0 };
};
}