2020-05-25 15:24:46 -04:00
|
|
|
/*
|
2020-05-25 11:46:10 -04:00
|
|
|
* Copyright (c) 2020, Hunter Salyer <thefalsehonesty@gmail.com>
|
|
|
|
*
|
2021-04-22 01:24:48 -07:00
|
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
2020-05-25 11:46:10 -04:00
|
|
|
*/
|
2020-05-25 15:24:46 -04:00
|
|
|
|
|
|
|
#include <AK/HashTable.h>
|
|
|
|
#include <AK/StringBuilder.h>
|
2021-07-31 00:43:42 -07:00
|
|
|
#include <AK/TypeCasts.h>
|
2020-05-25 15:24:46 -04:00
|
|
|
#include <LibJS/Lexer.h>
|
|
|
|
#include <LibJS/MarkupGenerator.h>
|
|
|
|
#include <LibJS/Runtime/Array.h>
|
|
|
|
#include <LibJS/Runtime/Date.h>
|
2022-01-14 17:55:11 -05:00
|
|
|
#include <LibJS/Runtime/DatePrototype.h>
|
2020-05-25 15:24:46 -04:00
|
|
|
#include <LibJS/Runtime/Error.h>
|
|
|
|
#include <LibJS/Runtime/Object.h>
|
2021-07-03 22:28:40 +01:00
|
|
|
#include <LibJS/Runtime/VM.h>
|
2020-05-25 15:24:46 -04:00
|
|
|
|
|
|
|
namespace JS {
|
|
|
|
|
2022-12-04 18:02:33 +00:00
|
|
|
DeprecatedString MarkupGenerator::html_from_source(StringView source)
|
2020-05-25 15:24:46 -04:00
|
|
|
{
|
|
|
|
StringBuilder builder;
|
2020-05-25 11:46:10 -04:00
|
|
|
auto lexer = Lexer(source);
|
2020-05-25 15:24:46 -04:00
|
|
|
for (auto token = lexer.next(); token.type() != TokenType::Eof; token = lexer.next()) {
|
2020-10-31 17:25:29 +00:00
|
|
|
builder.append(token.trivia());
|
2020-05-25 15:24:46 -04:00
|
|
|
builder.append(wrap_string_in_style(token.value(), style_type_for_token(token)));
|
|
|
|
}
|
2022-12-06 01:12:49 +00:00
|
|
|
return builder.to_deprecated_string();
|
2020-05-25 15:24:46 -04:00
|
|
|
}
|
|
|
|
|
2022-12-04 18:02:33 +00:00
|
|
|
DeprecatedString MarkupGenerator::html_from_value(Value value)
|
2020-05-25 15:24:46 -04:00
|
|
|
{
|
|
|
|
StringBuilder output_html;
|
|
|
|
value_to_html(value, output_html);
|
2022-12-06 01:12:49 +00:00
|
|
|
return output_html.to_deprecated_string();
|
2020-05-25 15:24:46 -04:00
|
|
|
}
|
|
|
|
|
2022-12-04 18:02:33 +00:00
|
|
|
DeprecatedString MarkupGenerator::html_from_error(Error const& object, bool in_promise)
|
2021-04-12 00:08:28 +02:00
|
|
|
{
|
|
|
|
StringBuilder output_html;
|
2022-10-08 19:38:32 +04:00
|
|
|
error_to_html(object, output_html, in_promise);
|
2022-12-06 01:12:49 +00:00
|
|
|
return output_html.to_deprecated_string();
|
2021-04-12 00:08:28 +02:00
|
|
|
}
|
|
|
|
|
2020-05-25 15:24:46 -04:00
|
|
|
void MarkupGenerator::value_to_html(Value value, StringBuilder& output_html, HashTable<Object*> seen_objects)
|
|
|
|
{
|
|
|
|
if (value.is_empty()) {
|
2022-07-11 17:32:29 +00:00
|
|
|
output_html.append("<empty>"sv);
|
2020-05-25 15:24:46 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (value.is_object()) {
|
|
|
|
if (seen_objects.contains(&value.as_object())) {
|
|
|
|
// FIXME: Maybe we should only do this for circular references,
|
|
|
|
// not for all reoccurring objects.
|
2020-10-04 13:34:25 +01:00
|
|
|
output_html.appendff("<already printed Object {:p}>", &value.as_object());
|
2020-05-25 15:24:46 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
seen_objects.set(&value.as_object());
|
|
|
|
}
|
|
|
|
|
|
|
|
if (value.is_object()) {
|
|
|
|
auto& object = value.as_object();
|
2021-07-05 18:58:51 +01:00
|
|
|
if (is<Array>(object))
|
2022-04-01 20:58:27 +03:00
|
|
|
return array_to_html(static_cast<Array const&>(object), output_html, seen_objects);
|
2021-04-20 11:41:59 +02:00
|
|
|
output_html.append(wrap_string_in_style(object.class_name(), StyleType::ObjectType));
|
2020-05-25 15:24:46 -04:00
|
|
|
if (object.is_function())
|
|
|
|
return function_to_html(object, output_html, seen_objects);
|
2021-01-01 17:46:39 +01:00
|
|
|
if (is<Date>(object))
|
2020-05-25 15:24:46 -04:00
|
|
|
return date_to_html(object, output_html, seen_objects);
|
|
|
|
return object_to_html(object, output_html, seen_objects);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (value.is_string())
|
|
|
|
output_html.append(open_style_type(StyleType::String));
|
|
|
|
else if (value.is_number())
|
|
|
|
output_html.append(open_style_type(StyleType::Number));
|
2020-10-02 16:00:15 +02:00
|
|
|
else if (value.is_boolean() || value.is_nullish())
|
2020-05-25 15:24:46 -04:00
|
|
|
output_html.append(open_style_type(StyleType::KeywordBold));
|
|
|
|
|
|
|
|
if (value.is_string())
|
|
|
|
output_html.append('"');
|
2020-07-22 21:43:08 -04:00
|
|
|
output_html.append(escape_html_entities(value.to_string_without_side_effects()));
|
2020-05-25 15:24:46 -04:00
|
|
|
if (value.is_string())
|
|
|
|
output_html.append('"');
|
|
|
|
|
2022-07-11 17:32:29 +00:00
|
|
|
output_html.append("</span>"sv);
|
2020-05-25 15:24:46 -04:00
|
|
|
}
|
|
|
|
|
2022-04-01 20:58:27 +03:00
|
|
|
void MarkupGenerator::array_to_html(Array const& array, StringBuilder& html_output, HashTable<Object*>& seen_objects)
|
2020-05-25 15:24:46 -04:00
|
|
|
{
|
|
|
|
html_output.append(wrap_string_in_style("[ ", StyleType::Punctuation));
|
LibJS: Object index properties have descriptors; Handle sparse indices
This patch adds an IndexedProperties object for storing indexed
properties within an Object. This accomplishes two goals: indexed
properties now have an associated descriptor, and objects now gracefully
handle sparse properties.
The IndexedProperties class is a wrapper around two other classes, one
for simple indexed properties storage, and one for general indexed
property storage. Simple indexed property storage is the common-case,
and is simply a vector of properties which all have attributes of
default_attributes (writable, enumerable, and configurable).
General indexed property storage is for a collection of indexed
properties where EITHER one or more properties have attributes other
than default_attributes OR there is a property with a large index (in
particular, large is '200' or higher).
Indexed properties are now treated relatively the same as storage within
the various Object methods. Additionally, there is a custom iterator
class for IndexedProperties which makes iteration easy. The iterator
skips empty values by default, but can be configured otherwise.
Likewise, it evaluates getters by default, but can be set not to.
2020-05-27 11:35:09 -07:00
|
|
|
bool first = true;
|
|
|
|
for (auto it = array.indexed_properties().begin(false); it != array.indexed_properties().end(); ++it) {
|
|
|
|
if (!first)
|
2020-05-25 15:24:46 -04:00
|
|
|
html_output.append(wrap_string_in_style(", ", StyleType::Punctuation));
|
LibJS: Object index properties have descriptors; Handle sparse indices
This patch adds an IndexedProperties object for storing indexed
properties within an Object. This accomplishes two goals: indexed
properties now have an associated descriptor, and objects now gracefully
handle sparse properties.
The IndexedProperties class is a wrapper around two other classes, one
for simple indexed properties storage, and one for general indexed
property storage. Simple indexed property storage is the common-case,
and is simply a vector of properties which all have attributes of
default_attributes (writable, enumerable, and configurable).
General indexed property storage is for a collection of indexed
properties where EITHER one or more properties have attributes other
than default_attributes OR there is a property with a large index (in
particular, large is '200' or higher).
Indexed properties are now treated relatively the same as storage within
the various Object methods. Additionally, there is a custom iterator
class for IndexedProperties which makes iteration easy. The iterator
skips empty values by default, but can be configured otherwise.
Likewise, it evaluates getters by default, but can be set not to.
2020-05-27 11:35:09 -07:00
|
|
|
first = false;
|
|
|
|
// FIXME: Exception check
|
2021-10-02 23:52:27 +01:00
|
|
|
value_to_html(array.get(it.index()).release_value(), html_output, seen_objects);
|
2020-05-25 15:24:46 -04:00
|
|
|
}
|
|
|
|
html_output.append(wrap_string_in_style(" ]", StyleType::Punctuation));
|
|
|
|
}
|
|
|
|
|
2022-04-01 20:58:27 +03:00
|
|
|
void MarkupGenerator::object_to_html(Object const& object, StringBuilder& html_output, HashTable<Object*>& seen_objects)
|
2020-05-25 15:24:46 -04:00
|
|
|
{
|
|
|
|
html_output.append(wrap_string_in_style("{ ", StyleType::Punctuation));
|
LibJS: Object index properties have descriptors; Handle sparse indices
This patch adds an IndexedProperties object for storing indexed
properties within an Object. This accomplishes two goals: indexed
properties now have an associated descriptor, and objects now gracefully
handle sparse properties.
The IndexedProperties class is a wrapper around two other classes, one
for simple indexed properties storage, and one for general indexed
property storage. Simple indexed property storage is the common-case,
and is simply a vector of properties which all have attributes of
default_attributes (writable, enumerable, and configurable).
General indexed property storage is for a collection of indexed
properties where EITHER one or more properties have attributes other
than default_attributes OR there is a property with a large index (in
particular, large is '200' or higher).
Indexed properties are now treated relatively the same as storage within
the various Object methods. Additionally, there is a custom iterator
class for IndexedProperties which makes iteration easy. The iterator
skips empty values by default, but can be configured otherwise.
Likewise, it evaluates getters by default, but can be set not to.
2020-05-27 11:35:09 -07:00
|
|
|
bool first = true;
|
|
|
|
for (auto& entry : object.indexed_properties()) {
|
|
|
|
if (!first)
|
2020-05-25 15:24:46 -04:00
|
|
|
html_output.append(wrap_string_in_style(", ", StyleType::Punctuation));
|
LibJS: Object index properties have descriptors; Handle sparse indices
This patch adds an IndexedProperties object for storing indexed
properties within an Object. This accomplishes two goals: indexed
properties now have an associated descriptor, and objects now gracefully
handle sparse properties.
The IndexedProperties class is a wrapper around two other classes, one
for simple indexed properties storage, and one for general indexed
property storage. Simple indexed property storage is the common-case,
and is simply a vector of properties which all have attributes of
default_attributes (writable, enumerable, and configurable).
General indexed property storage is for a collection of indexed
properties where EITHER one or more properties have attributes other
than default_attributes OR there is a property with a large index (in
particular, large is '200' or higher).
Indexed properties are now treated relatively the same as storage within
the various Object methods. Additionally, there is a custom iterator
class for IndexedProperties which makes iteration easy. The iterator
skips empty values by default, but can be configured otherwise.
Likewise, it evaluates getters by default, but can be set not to.
2020-05-27 11:35:09 -07:00
|
|
|
first = false;
|
2022-12-04 18:02:33 +00:00
|
|
|
html_output.append(wrap_string_in_style(DeprecatedString::number(entry.index()), StyleType::Number));
|
LibJS: Object index properties have descriptors; Handle sparse indices
This patch adds an IndexedProperties object for storing indexed
properties within an Object. This accomplishes two goals: indexed
properties now have an associated descriptor, and objects now gracefully
handle sparse properties.
The IndexedProperties class is a wrapper around two other classes, one
for simple indexed properties storage, and one for general indexed
property storage. Simple indexed property storage is the common-case,
and is simply a vector of properties which all have attributes of
default_attributes (writable, enumerable, and configurable).
General indexed property storage is for a collection of indexed
properties where EITHER one or more properties have attributes other
than default_attributes OR there is a property with a large index (in
particular, large is '200' or higher).
Indexed properties are now treated relatively the same as storage within
the various Object methods. Additionally, there is a custom iterator
class for IndexedProperties which makes iteration easy. The iterator
skips empty values by default, but can be configured otherwise.
Likewise, it evaluates getters by default, but can be set not to.
2020-05-27 11:35:09 -07:00
|
|
|
html_output.append(wrap_string_in_style(": ", StyleType::Punctuation));
|
|
|
|
// FIXME: Exception check
|
2021-10-02 23:52:27 +01:00
|
|
|
value_to_html(object.get(entry.index()).release_value(), html_output, seen_objects);
|
2020-05-25 15:24:46 -04:00
|
|
|
}
|
|
|
|
|
LibJS: Object index properties have descriptors; Handle sparse indices
This patch adds an IndexedProperties object for storing indexed
properties within an Object. This accomplishes two goals: indexed
properties now have an associated descriptor, and objects now gracefully
handle sparse properties.
The IndexedProperties class is a wrapper around two other classes, one
for simple indexed properties storage, and one for general indexed
property storage. Simple indexed property storage is the common-case,
and is simply a vector of properties which all have attributes of
default_attributes (writable, enumerable, and configurable).
General indexed property storage is for a collection of indexed
properties where EITHER one or more properties have attributes other
than default_attributes OR there is a property with a large index (in
particular, large is '200' or higher).
Indexed properties are now treated relatively the same as storage within
the various Object methods. Additionally, there is a custom iterator
class for IndexedProperties which makes iteration easy. The iterator
skips empty values by default, but can be configured otherwise.
Likewise, it evaluates getters by default, but can be set not to.
2020-05-27 11:35:09 -07:00
|
|
|
if (!object.indexed_properties().is_empty() && object.shape().property_count())
|
2020-05-25 15:24:46 -04:00
|
|
|
html_output.append(wrap_string_in_style(", ", StyleType::Punctuation));
|
|
|
|
|
|
|
|
size_t index = 0;
|
|
|
|
for (auto& it : object.shape().property_table_ordered()) {
|
2022-12-04 18:02:33 +00:00
|
|
|
html_output.append(wrap_string_in_style(DeprecatedString::formatted("\"{}\"", escape_html_entities(it.key.to_display_string())), StyleType::String));
|
2020-05-25 15:24:46 -04:00
|
|
|
html_output.append(wrap_string_in_style(": ", StyleType::Punctuation));
|
|
|
|
value_to_html(object.get_direct(it.value.offset), html_output, seen_objects);
|
|
|
|
if (index != object.shape().property_count() - 1)
|
|
|
|
html_output.append(wrap_string_in_style(", ", StyleType::Punctuation));
|
|
|
|
++index;
|
|
|
|
}
|
|
|
|
|
|
|
|
html_output.append(wrap_string_in_style(" }", StyleType::Punctuation));
|
|
|
|
}
|
|
|
|
|
2022-04-01 20:58:27 +03:00
|
|
|
void MarkupGenerator::function_to_html(Object const& function, StringBuilder& html_output, HashTable<Object*>&)
|
2020-05-25 15:24:46 -04:00
|
|
|
{
|
2020-10-04 13:34:25 +01:00
|
|
|
html_output.appendff("[{}]", function.class_name());
|
2020-05-25 15:24:46 -04:00
|
|
|
}
|
|
|
|
|
2022-04-01 20:58:27 +03:00
|
|
|
void MarkupGenerator::date_to_html(Object const& date, StringBuilder& html_output, HashTable<Object*>&)
|
2020-05-25 15:24:46 -04:00
|
|
|
{
|
2022-04-03 15:19:33 +01:00
|
|
|
html_output.appendff("Date {}", to_date_string(static_cast<Date const&>(date).date_value()));
|
2020-05-25 15:24:46 -04:00
|
|
|
}
|
|
|
|
|
2022-10-08 19:38:32 +04:00
|
|
|
void MarkupGenerator::trace_to_html(TracebackFrame const& traceback_frame, StringBuilder& html_output)
|
2020-05-25 15:24:46 -04:00
|
|
|
{
|
2022-10-08 19:38:32 +04:00
|
|
|
auto function_name = escape_html_entities(traceback_frame.function_name);
|
|
|
|
auto [line, column, _] = traceback_frame.source_range.start;
|
|
|
|
auto get_filename_from_path = [&](StringView filename) -> StringView {
|
|
|
|
auto last_slash_index = filename.find_last('/');
|
|
|
|
return last_slash_index.has_value() ? filename.substring_view(*last_slash_index + 1) : filename;
|
|
|
|
};
|
LibJS: Reduce AST memory usage by shrink-wrapping source range info
Before this change, each AST node had a 64-byte SourceRange member.
This SourceRange had the following layout:
filename: StringView (16 bytes)
start: Position (24 bytes)
end: Position (24 bytes)
The Position structs have { line, column, offset }, all members size_t.
To reduce memory consumption, AST nodes now only store the following:
source_code: NonnullRefPtr<SourceCode> (8 bytes)
start_offset: u32 (4 bytes)
end_offset: u32 (4 bytes)
SourceCode is a new ref-counted data structure that keeps the filename
and original parsed source code in a single location, and all AST nodes
have a pointer to it.
The start_offset and end_offset can be turned into (line, column) when
necessary by calling SourceCode::range_from_offsets(). This will walk
the source code string and compute line/column numbers on the fly, so
it's not necessarily fast, but it should be rare since this information
is primarily used for diagnostics and exception stack traces.
With this, ASTNode shrinks from 80 bytes to 32 bytes. This gives us a
~23% reduction in memory usage when loading twitter.com/awesomekling
(330 MiB before, 253 MiB after!) :^)
2022-11-21 17:37:38 +01:00
|
|
|
auto filename = escape_html_entities(get_filename_from_path(traceback_frame.source_range.filename()));
|
2022-12-04 18:02:33 +00:00
|
|
|
auto trace = DeprecatedString::formatted("at {} ({}:{}:{})", function_name, filename, line, column);
|
2022-10-08 19:38:32 +04:00
|
|
|
|
|
|
|
html_output.appendff(" {}<br>", trace);
|
|
|
|
}
|
|
|
|
|
|
|
|
void MarkupGenerator::error_to_html(Error const& error, StringBuilder& html_output, bool in_promise)
|
|
|
|
{
|
|
|
|
auto& vm = error.vm();
|
|
|
|
auto name = error.get_without_side_effects(vm.names.name).value_or(js_undefined());
|
|
|
|
auto message = error.get_without_side_effects(vm.names.message).value_or(js_undefined());
|
|
|
|
auto name_string = name.to_string_without_side_effects();
|
|
|
|
auto message_string = message.to_string_without_side_effects();
|
2022-12-04 18:02:33 +00:00
|
|
|
auto uncaught_message = DeprecatedString::formatted("Uncaught {}[{}]: ", in_promise ? "(in promise) " : "", name_string);
|
2022-10-08 19:38:32 +04:00
|
|
|
|
|
|
|
html_output.append(wrap_string_in_style(uncaught_message, StyleType::Invalid));
|
|
|
|
html_output.appendff("{}<br>", message_string.is_empty() ? "\"\"" : escape_html_entities(message_string));
|
|
|
|
|
|
|
|
for (size_t i = 0; i < error.traceback().size() - min(error.traceback().size(), 3); i++) {
|
|
|
|
auto& traceback_frame = error.traceback().at(i);
|
|
|
|
trace_to_html(traceback_frame, html_output);
|
2020-05-25 15:24:46 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-12-04 18:02:33 +00:00
|
|
|
DeprecatedString MarkupGenerator::style_from_style_type(StyleType type)
|
2020-05-25 15:24:46 -04:00
|
|
|
{
|
|
|
|
switch (type) {
|
|
|
|
case StyleType::Invalid:
|
|
|
|
return "color: red;";
|
|
|
|
case StyleType::String:
|
|
|
|
return "color: -libweb-palette-syntax-string;";
|
|
|
|
case StyleType::Number:
|
|
|
|
return "color: -libweb-palette-syntax-number;";
|
|
|
|
case StyleType::KeywordBold:
|
|
|
|
return "color: -libweb-palette-syntax-keyword; font-weight: bold;";
|
|
|
|
case StyleType::Punctuation:
|
|
|
|
return "color: -libweb-palette-syntax-punctuation;";
|
|
|
|
case StyleType::Operator:
|
|
|
|
return "color: -libweb-palette-syntax-operator;";
|
|
|
|
case StyleType::Keyword:
|
|
|
|
return "color: -libweb-palette-syntax-keyword;";
|
|
|
|
case StyleType::ControlKeyword:
|
|
|
|
return "color: -libweb-palette-syntax-control-keyword;";
|
|
|
|
case StyleType::Identifier:
|
|
|
|
return "color: -libweb-palette-syntax-identifier;";
|
2021-04-20 11:41:59 +02:00
|
|
|
case StyleType::ObjectType:
|
|
|
|
return "padding: 2px; background-color: #ddf; color: black; font-weight: bold;";
|
2020-05-25 15:24:46 -04:00
|
|
|
default:
|
2021-02-23 20:42:32 +01:00
|
|
|
VERIFY_NOT_REACHED();
|
2020-05-25 15:24:46 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
MarkupGenerator::StyleType MarkupGenerator::style_type_for_token(Token token)
|
|
|
|
{
|
LibJS: Unify syntax highlighting
So far we have three different syntax highlighters for LibJS:
- js's Line::Editor stylization
- JS::MarkupGenerator
- GUI::JSSyntaxHighlighter
This not only caused repetition of most token types in each highlighter
but also a lot of inconsistency regarding the styling of certain tokens:
- JSSyntaxHighlighter was considering TokenType::Period to be an
operator whereas MarkupGenerator categorized it as punctuation.
- MarkupGenerator was considering TokenType::{Break,Case,Continue,
Default,Switch,With} control keywords whereas JSSyntaxHighlighter just
disregarded them
- MarkupGenerator considered some future reserved keywords invalid and
others not. JSSyntaxHighlighter and js disregarded most
Adding a new token type meant adding it to ENUMERATE_JS_TOKENS as well
as each individual highlighter's switch/case construct.
I added a TokenCategory enum, and each TokenType is now associated to a
certain category, which the syntax highlighters then can use for styling
rather than operating on the token type directly. This also makes
changing a token's category everywhere easier, should we need to do that
(e.g. I decided to make TokenType::{Period,QuestionMarkPeriod}
TokenCategory::Operator for now, but we might want to change them to
Punctuation.
2020-10-04 22:28:59 +01:00
|
|
|
switch (token.category()) {
|
|
|
|
case TokenCategory::Invalid:
|
2020-05-25 15:24:46 -04:00
|
|
|
return StyleType::Invalid;
|
LibJS: Unify syntax highlighting
So far we have three different syntax highlighters for LibJS:
- js's Line::Editor stylization
- JS::MarkupGenerator
- GUI::JSSyntaxHighlighter
This not only caused repetition of most token types in each highlighter
but also a lot of inconsistency regarding the styling of certain tokens:
- JSSyntaxHighlighter was considering TokenType::Period to be an
operator whereas MarkupGenerator categorized it as punctuation.
- MarkupGenerator was considering TokenType::{Break,Case,Continue,
Default,Switch,With} control keywords whereas JSSyntaxHighlighter just
disregarded them
- MarkupGenerator considered some future reserved keywords invalid and
others not. JSSyntaxHighlighter and js disregarded most
Adding a new token type meant adding it to ENUMERATE_JS_TOKENS as well
as each individual highlighter's switch/case construct.
I added a TokenCategory enum, and each TokenType is now associated to a
certain category, which the syntax highlighters then can use for styling
rather than operating on the token type directly. This also makes
changing a token's category everywhere easier, should we need to do that
(e.g. I decided to make TokenType::{Period,QuestionMarkPeriod}
TokenCategory::Operator for now, but we might want to change them to
Punctuation.
2020-10-04 22:28:59 +01:00
|
|
|
case TokenCategory::Number:
|
2020-05-25 15:24:46 -04:00
|
|
|
return StyleType::Number;
|
LibJS: Unify syntax highlighting
So far we have three different syntax highlighters for LibJS:
- js's Line::Editor stylization
- JS::MarkupGenerator
- GUI::JSSyntaxHighlighter
This not only caused repetition of most token types in each highlighter
but also a lot of inconsistency regarding the styling of certain tokens:
- JSSyntaxHighlighter was considering TokenType::Period to be an
operator whereas MarkupGenerator categorized it as punctuation.
- MarkupGenerator was considering TokenType::{Break,Case,Continue,
Default,Switch,With} control keywords whereas JSSyntaxHighlighter just
disregarded them
- MarkupGenerator considered some future reserved keywords invalid and
others not. JSSyntaxHighlighter and js disregarded most
Adding a new token type meant adding it to ENUMERATE_JS_TOKENS as well
as each individual highlighter's switch/case construct.
I added a TokenCategory enum, and each TokenType is now associated to a
certain category, which the syntax highlighters then can use for styling
rather than operating on the token type directly. This also makes
changing a token's category everywhere easier, should we need to do that
(e.g. I decided to make TokenType::{Period,QuestionMarkPeriod}
TokenCategory::Operator for now, but we might want to change them to
Punctuation.
2020-10-04 22:28:59 +01:00
|
|
|
case TokenCategory::String:
|
2020-05-25 15:24:46 -04:00
|
|
|
return StyleType::String;
|
LibJS: Unify syntax highlighting
So far we have three different syntax highlighters for LibJS:
- js's Line::Editor stylization
- JS::MarkupGenerator
- GUI::JSSyntaxHighlighter
This not only caused repetition of most token types in each highlighter
but also a lot of inconsistency regarding the styling of certain tokens:
- JSSyntaxHighlighter was considering TokenType::Period to be an
operator whereas MarkupGenerator categorized it as punctuation.
- MarkupGenerator was considering TokenType::{Break,Case,Continue,
Default,Switch,With} control keywords whereas JSSyntaxHighlighter just
disregarded them
- MarkupGenerator considered some future reserved keywords invalid and
others not. JSSyntaxHighlighter and js disregarded most
Adding a new token type meant adding it to ENUMERATE_JS_TOKENS as well
as each individual highlighter's switch/case construct.
I added a TokenCategory enum, and each TokenType is now associated to a
certain category, which the syntax highlighters then can use for styling
rather than operating on the token type directly. This also makes
changing a token's category everywhere easier, should we need to do that
(e.g. I decided to make TokenType::{Period,QuestionMarkPeriod}
TokenCategory::Operator for now, but we might want to change them to
Punctuation.
2020-10-04 22:28:59 +01:00
|
|
|
case TokenCategory::Punctuation:
|
2020-05-25 15:24:46 -04:00
|
|
|
return StyleType::Punctuation;
|
LibJS: Unify syntax highlighting
So far we have three different syntax highlighters for LibJS:
- js's Line::Editor stylization
- JS::MarkupGenerator
- GUI::JSSyntaxHighlighter
This not only caused repetition of most token types in each highlighter
but also a lot of inconsistency regarding the styling of certain tokens:
- JSSyntaxHighlighter was considering TokenType::Period to be an
operator whereas MarkupGenerator categorized it as punctuation.
- MarkupGenerator was considering TokenType::{Break,Case,Continue,
Default,Switch,With} control keywords whereas JSSyntaxHighlighter just
disregarded them
- MarkupGenerator considered some future reserved keywords invalid and
others not. JSSyntaxHighlighter and js disregarded most
Adding a new token type meant adding it to ENUMERATE_JS_TOKENS as well
as each individual highlighter's switch/case construct.
I added a TokenCategory enum, and each TokenType is now associated to a
certain category, which the syntax highlighters then can use for styling
rather than operating on the token type directly. This also makes
changing a token's category everywhere easier, should we need to do that
(e.g. I decided to make TokenType::{Period,QuestionMarkPeriod}
TokenCategory::Operator for now, but we might want to change them to
Punctuation.
2020-10-04 22:28:59 +01:00
|
|
|
case TokenCategory::Operator:
|
2020-05-25 15:24:46 -04:00
|
|
|
return StyleType::Operator;
|
LibJS: Unify syntax highlighting
So far we have three different syntax highlighters for LibJS:
- js's Line::Editor stylization
- JS::MarkupGenerator
- GUI::JSSyntaxHighlighter
This not only caused repetition of most token types in each highlighter
but also a lot of inconsistency regarding the styling of certain tokens:
- JSSyntaxHighlighter was considering TokenType::Period to be an
operator whereas MarkupGenerator categorized it as punctuation.
- MarkupGenerator was considering TokenType::{Break,Case,Continue,
Default,Switch,With} control keywords whereas JSSyntaxHighlighter just
disregarded them
- MarkupGenerator considered some future reserved keywords invalid and
others not. JSSyntaxHighlighter and js disregarded most
Adding a new token type meant adding it to ENUMERATE_JS_TOKENS as well
as each individual highlighter's switch/case construct.
I added a TokenCategory enum, and each TokenType is now associated to a
certain category, which the syntax highlighters then can use for styling
rather than operating on the token type directly. This also makes
changing a token's category everywhere easier, should we need to do that
(e.g. I decided to make TokenType::{Period,QuestionMarkPeriod}
TokenCategory::Operator for now, but we might want to change them to
Punctuation.
2020-10-04 22:28:59 +01:00
|
|
|
case TokenCategory::Keyword:
|
|
|
|
switch (token.type()) {
|
|
|
|
case TokenType::BoolLiteral:
|
|
|
|
case TokenType::NullLiteral:
|
|
|
|
return StyleType::KeywordBold;
|
|
|
|
default:
|
|
|
|
return StyleType::Keyword;
|
|
|
|
}
|
|
|
|
case TokenCategory::ControlKeyword:
|
2020-05-25 15:24:46 -04:00
|
|
|
return StyleType::ControlKeyword;
|
LibJS: Unify syntax highlighting
So far we have three different syntax highlighters for LibJS:
- js's Line::Editor stylization
- JS::MarkupGenerator
- GUI::JSSyntaxHighlighter
This not only caused repetition of most token types in each highlighter
but also a lot of inconsistency regarding the styling of certain tokens:
- JSSyntaxHighlighter was considering TokenType::Period to be an
operator whereas MarkupGenerator categorized it as punctuation.
- MarkupGenerator was considering TokenType::{Break,Case,Continue,
Default,Switch,With} control keywords whereas JSSyntaxHighlighter just
disregarded them
- MarkupGenerator considered some future reserved keywords invalid and
others not. JSSyntaxHighlighter and js disregarded most
Adding a new token type meant adding it to ENUMERATE_JS_TOKENS as well
as each individual highlighter's switch/case construct.
I added a TokenCategory enum, and each TokenType is now associated to a
certain category, which the syntax highlighters then can use for styling
rather than operating on the token type directly. This also makes
changing a token's category everywhere easier, should we need to do that
(e.g. I decided to make TokenType::{Period,QuestionMarkPeriod}
TokenCategory::Operator for now, but we might want to change them to
Punctuation.
2020-10-04 22:28:59 +01:00
|
|
|
case TokenCategory::Identifier:
|
2020-05-25 15:24:46 -04:00
|
|
|
return StyleType::Identifier;
|
|
|
|
default:
|
2020-10-04 15:44:40 +01:00
|
|
|
dbgln("Unknown style type for token {}", token.name());
|
2021-02-23 20:42:32 +01:00
|
|
|
VERIFY_NOT_REACHED();
|
2020-05-25 15:24:46 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-12-04 18:02:33 +00:00
|
|
|
DeprecatedString MarkupGenerator::open_style_type(StyleType type)
|
2020-05-25 15:24:46 -04:00
|
|
|
{
|
2022-12-04 18:02:33 +00:00
|
|
|
return DeprecatedString::formatted("<span style=\"{}\">", style_from_style_type(type));
|
2020-05-25 15:24:46 -04:00
|
|
|
}
|
|
|
|
|
2022-12-04 18:02:33 +00:00
|
|
|
DeprecatedString MarkupGenerator::wrap_string_in_style(DeprecatedString source, StyleType type)
|
2020-05-25 15:24:46 -04:00
|
|
|
{
|
2022-12-04 18:02:33 +00:00
|
|
|
return DeprecatedString::formatted("<span style=\"{}\">{}</span>", style_from_style_type(type), escape_html_entities(source));
|
2020-05-25 15:24:46 -04:00
|
|
|
}
|
|
|
|
|
2020-05-26 13:00:30 -04:00
|
|
|
}
|