2020-05-25 19:24:46 +00:00
|
|
|
/*
|
2020-05-25 15:46:10 +00:00
|
|
|
* Copyright (c) 2020, Hunter Salyer <thefalsehonesty@gmail.com>
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions are met:
|
|
|
|
*
|
|
|
|
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
|
|
* list of conditions and the following disclaimer.
|
|
|
|
*
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
|
|
* and/or other materials provided with the distribution.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
|
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
|
|
|
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
|
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
|
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
2020-05-25 19:24:46 +00:00
|
|
|
|
|
|
|
#include <AK/HashTable.h>
|
|
|
|
#include <AK/StringBuilder.h>
|
|
|
|
#include <LibJS/Lexer.h>
|
|
|
|
#include <LibJS/MarkupGenerator.h>
|
|
|
|
#include <LibJS/Runtime/Array.h>
|
|
|
|
#include <LibJS/Runtime/Date.h>
|
|
|
|
#include <LibJS/Runtime/Error.h>
|
|
|
|
#include <LibJS/Runtime/Object.h>
|
|
|
|
|
|
|
|
namespace JS {
|
|
|
|
|
2020-05-25 15:46:10 +00:00
|
|
|
String MarkupGenerator::html_from_source(const StringView& source)
|
2020-05-25 19:24:46 +00:00
|
|
|
{
|
|
|
|
StringBuilder builder;
|
2020-05-25 15:46:10 +00:00
|
|
|
auto lexer = Lexer(source);
|
2020-05-25 19:24:46 +00: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 19:24:46 +00:00
|
|
|
builder.append(wrap_string_in_style(token.value(), style_type_for_token(token)));
|
|
|
|
}
|
|
|
|
return builder.to_string();
|
|
|
|
}
|
|
|
|
|
|
|
|
String MarkupGenerator::html_from_value(Value value)
|
|
|
|
{
|
|
|
|
StringBuilder output_html;
|
|
|
|
value_to_html(value, output_html);
|
|
|
|
return output_html.to_string();
|
|
|
|
}
|
|
|
|
|
2021-04-11 22:08:28 +00:00
|
|
|
String MarkupGenerator::html_from_error(Object& object)
|
|
|
|
{
|
|
|
|
StringBuilder output_html;
|
|
|
|
HashTable<Object*> seen_objects;
|
|
|
|
error_to_html(object, output_html, seen_objects);
|
|
|
|
return output_html.to_string();
|
|
|
|
}
|
|
|
|
|
2020-05-25 19:24:46 +00:00
|
|
|
void MarkupGenerator::value_to_html(Value value, StringBuilder& output_html, HashTable<Object*> seen_objects)
|
|
|
|
{
|
|
|
|
if (value.is_empty()) {
|
|
|
|
output_html.append("<empty>");
|
|
|
|
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 12:34:25 +00:00
|
|
|
output_html.appendff("<already printed Object {:p}>", &value.as_object());
|
2020-05-25 19:24:46 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
seen_objects.set(&value.as_object());
|
|
|
|
}
|
|
|
|
|
|
|
|
if (value.is_array())
|
|
|
|
return array_to_html(static_cast<const Array&>(value.as_object()), output_html, seen_objects);
|
|
|
|
|
|
|
|
if (value.is_object()) {
|
|
|
|
auto& object = value.as_object();
|
2021-04-20 09:41:59 +00:00
|
|
|
output_html.append(wrap_string_in_style(object.class_name(), StyleType::ObjectType));
|
2020-05-25 19:24:46 +00:00
|
|
|
if (object.is_function())
|
|
|
|
return function_to_html(object, output_html, seen_objects);
|
2021-01-01 16:46:39 +00:00
|
|
|
if (is<Date>(object))
|
2020-05-25 19:24:46 +00:00
|
|
|
return date_to_html(object, output_html, seen_objects);
|
2021-01-01 16:46:39 +00:00
|
|
|
if (is<Error>(object))
|
2020-05-25 19:24:46 +00:00
|
|
|
return error_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 14:00:15 +00:00
|
|
|
else if (value.is_boolean() || value.is_nullish())
|
2020-05-25 19:24:46 +00:00
|
|
|
output_html.append(open_style_type(StyleType::KeywordBold));
|
|
|
|
|
|
|
|
if (value.is_string())
|
|
|
|
output_html.append('"');
|
2020-07-23 01:43:08 +00:00
|
|
|
output_html.append(escape_html_entities(value.to_string_without_side_effects()));
|
2020-05-25 19:24:46 +00:00
|
|
|
if (value.is_string())
|
|
|
|
output_html.append('"');
|
|
|
|
|
|
|
|
output_html.append("</span>");
|
|
|
|
}
|
|
|
|
|
|
|
|
void MarkupGenerator::array_to_html(const Array& array, StringBuilder& html_output, HashTable<Object*>& seen_objects)
|
|
|
|
{
|
|
|
|
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 18:35:09 +00:00
|
|
|
bool first = true;
|
|
|
|
for (auto it = array.indexed_properties().begin(false); it != array.indexed_properties().end(); ++it) {
|
|
|
|
if (!first)
|
2020-05-25 19:24:46 +00: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 18:35:09 +00:00
|
|
|
first = false;
|
|
|
|
// FIXME: Exception check
|
|
|
|
value_to_html(it.value_and_attributes(const_cast<Array*>(&array)).value, html_output, seen_objects);
|
2020-05-25 19:24:46 +00:00
|
|
|
}
|
|
|
|
html_output.append(wrap_string_in_style(" ]", StyleType::Punctuation));
|
|
|
|
}
|
|
|
|
|
|
|
|
void MarkupGenerator::object_to_html(const Object& object, StringBuilder& html_output, HashTable<Object*>& seen_objects)
|
|
|
|
{
|
|
|
|
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 18:35:09 +00:00
|
|
|
bool first = true;
|
|
|
|
for (auto& entry : object.indexed_properties()) {
|
|
|
|
if (!first)
|
2020-05-25 19:24:46 +00: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 18:35:09 +00:00
|
|
|
first = false;
|
|
|
|
html_output.append(wrap_string_in_style(String::number(entry.index()), StyleType::Number));
|
|
|
|
html_output.append(wrap_string_in_style(": ", StyleType::Punctuation));
|
|
|
|
// FIXME: Exception check
|
|
|
|
value_to_html(entry.value_and_attributes(const_cast<Object*>(&object)).value, html_output, seen_objects);
|
2020-05-25 19:24:46 +00: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 18:35:09 +00:00
|
|
|
if (!object.indexed_properties().is_empty() && object.shape().property_count())
|
2020-05-25 19:24:46 +00:00
|
|
|
html_output.append(wrap_string_in_style(", ", StyleType::Punctuation));
|
|
|
|
|
|
|
|
size_t index = 0;
|
|
|
|
for (auto& it : object.shape().property_table_ordered()) {
|
2020-10-04 12:34:25 +00:00
|
|
|
html_output.append(wrap_string_in_style(String::formatted("\"{}\"", escape_html_entities(it.key.to_display_string())), StyleType::String));
|
2020-05-25 19:24:46 +00: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));
|
|
|
|
}
|
|
|
|
|
|
|
|
void MarkupGenerator::function_to_html(const Object& function, StringBuilder& html_output, HashTable<Object*>&)
|
|
|
|
{
|
2020-10-04 12:34:25 +00:00
|
|
|
html_output.appendff("[{}]", function.class_name());
|
2020-05-25 19:24:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void MarkupGenerator::date_to_html(const Object& date, StringBuilder& html_output, HashTable<Object*>&)
|
|
|
|
{
|
2020-10-04 12:34:25 +00:00
|
|
|
html_output.appendff("Date {}", static_cast<const JS::Date&>(date).string());
|
2020-05-25 19:24:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void MarkupGenerator::error_to_html(const Object& object, StringBuilder& html_output, HashTable<Object*>&)
|
|
|
|
{
|
2021-04-11 22:08:28 +00:00
|
|
|
auto name = object.get_without_side_effects("name").value_or(JS::js_undefined());
|
|
|
|
auto message = object.get_without_side_effects("message").value_or(JS::js_undefined());
|
|
|
|
if (name.is_accessor() || name.is_native_property() || message.is_accessor() || message.is_native_property()) {
|
|
|
|
html_output.append(wrap_string_in_style(JS::Value(&object).to_string_without_side_effects(), StyleType::Invalid));
|
|
|
|
} else {
|
|
|
|
auto name_string = name.to_string_without_side_effects();
|
|
|
|
auto message_string = message.to_string_without_side_effects();
|
|
|
|
html_output.append(wrap_string_in_style(String::formatted("[{}]", name_string), StyleType::Invalid));
|
|
|
|
if (!message_string.is_empty())
|
|
|
|
html_output.appendff(": {}", escape_html_entities(message_string));
|
2020-05-25 19:24:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
String MarkupGenerator::style_from_style_type(StyleType type)
|
|
|
|
{
|
|
|
|
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 09:41:59 +00:00
|
|
|
case StyleType::ObjectType:
|
|
|
|
return "padding: 2px; background-color: #ddf; color: black; font-weight: bold;";
|
2020-05-25 19:24:46 +00:00
|
|
|
default:
|
2021-02-23 19:42:32 +00:00
|
|
|
VERIFY_NOT_REACHED();
|
2020-05-25 19:24:46 +00: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 21:28:59 +00:00
|
|
|
switch (token.category()) {
|
|
|
|
case TokenCategory::Invalid:
|
2020-05-25 19:24:46 +00: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 21:28:59 +00:00
|
|
|
case TokenCategory::Number:
|
2020-05-25 19:24:46 +00: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 21:28:59 +00:00
|
|
|
case TokenCategory::String:
|
2020-05-25 19:24:46 +00: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 21:28:59 +00:00
|
|
|
case TokenCategory::Punctuation:
|
2020-05-25 19:24:46 +00: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 21:28:59 +00:00
|
|
|
case TokenCategory::Operator:
|
2020-05-25 19:24:46 +00: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 21:28:59 +00: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 19:24:46 +00: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 21:28:59 +00:00
|
|
|
case TokenCategory::Identifier:
|
2020-05-25 19:24:46 +00:00
|
|
|
return StyleType::Identifier;
|
|
|
|
default:
|
2020-10-04 14:44:40 +00:00
|
|
|
dbgln("Unknown style type for token {}", token.name());
|
2021-02-23 19:42:32 +00:00
|
|
|
VERIFY_NOT_REACHED();
|
2020-05-25 19:24:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
String MarkupGenerator::open_style_type(StyleType type)
|
|
|
|
{
|
2020-10-04 12:34:25 +00:00
|
|
|
return String::formatted("<span style=\"{}\">", style_from_style_type(type));
|
2020-05-25 19:24:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
String MarkupGenerator::wrap_string_in_style(String source, StyleType type)
|
|
|
|
{
|
2020-10-04 12:34:25 +00:00
|
|
|
return String::formatted("<span style=\"{}\">{}</span>", style_from_style_type(type), escape_html_entities(source));
|
2020-05-25 19:24:46 +00:00
|
|
|
}
|
|
|
|
|
2020-05-26 17:00:30 +00:00
|
|
|
}
|