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

LibJS: Remove ConsoleMessage from LibJS

Browse source 
We don't need to store the past messages in LibJS.
We'll implement a way to let LibJS users expand the vanilla Console.
This commit is contained in:
Emanuele Torre 2020-05-04 12:02:16 +02:00 • committed by Andreas Kling
parent 7dd49047f3
commit 046f9cf115
3 changed files with 20 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Libraries/LibJS/Console.cpp
View file

@ -37,44 +37,34 @@ Console::Console(Interpreter& interpreter)
{
}
void Console::add_message(ConsoleMessageKind kind, String text)
{
ConsoleMessage message = { kind, text };
m_messages.append(message);
if (on_new_message)
on_new_message(message);
}
void Console::debug(String text)
{
add_message(ConsoleMessageKind::Debug, text);
dbg() << "debug: " << text;
}
void Console::error(String text)
{
add_message(ConsoleMessageKind::Error, text);
dbg() << "error: " << text;
}
void Console::info(String text)
{
add_message(ConsoleMessageKind::Info, text);
dbg() << "info: " << text;
}
void Console::log(String text)
{
add_message(ConsoleMessageKind::Log, text);
dbg() << "log: " << text;
}
void Console::warn(String text)
{
add_message(ConsoleMessageKind::Warn, text);
dbg() << "warn: " << text;
}
void Console::clear()
{
m_messages.clear();
add_message(ConsoleMessageKind::Clear, {});
dbg() << "clear:";
}
void Console::trace(String title)
@ -86,38 +76,38 @@ void Console::trace(String title)
// -2 to skip the console.trace() call frame
for (ssize_t i = call_stack.size() - 2; i >= 0; --i) {
auto function_name = call_stack[i].function_name;
message_text.append("\n\t");
message_text.append("\n -> ");
if (String(function_name).is_empty())
function_name = "<anonymous>";
message_text.append(function_name);
}
add_message(ConsoleMessageKind::Trace, message_text.build());
dbg() << "log: " << message_text.build();
}
unsigned Console::count(String label)
void Console::count(String label)
{
auto counter_value = m_counters.get(label);
if (!counter_value.has_value()) {
add_message(ConsoleMessageKind::Count, String::format("%s: 1", label.characters()));
dbg() << "log: " << label << ": 1";
m_counters.set(label, 1);
return 1;
return;
}
auto new_counter_value = counter_value.value() + 1;
add_message(ConsoleMessageKind::Count, String::format("%s: %u", label.characters(), new_counter_value));
dbg() << "log: " << label << ": " << new_counter_value;
m_counters.set(label, new_counter_value);
return new_counter_value;
}
bool Console::count_reset(String label)
void Console::count_reset(String label)
{
if (!m_counters.contains(label))
return false;
if (m_counters.contains(label)) {
dbg() << "warn: \"" << label << "\" doesn't have a count";
return;
}
m_counters.remove(label);
add_message(ConsoleMessageKind::Count, String::format("%s: 0", label.characters()));
return true;
dbg() << "log: " << label << ": 0";
}
}