mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 07:57:46 +00:00
LibWeb+LibSyntax: Implement nested syntax highlighters
And use them to highlight javascript in HTML source. This commit also changes how TextDocumentSpan::data is interpreted, as it used to be an opaque pointer, but everyone stuffed an enum value inside it, which made the values not unique to each highlighter; that field is now a u64 serial id. The syntax highlighters don't need to change their ways of stuffing token types into that field, but a highlighter that calls another nested highlighter needs to register the nested types for use with token pairs.
This commit is contained in:
parent
3bac14e19e
commit
71b4433b0d
18 changed files with 219 additions and 104 deletions
|
@ -32,9 +32,9 @@ static Syntax::TextStyle style_for_token_type(const Gfx::Palette& palette, IniTo
|
|||
}
|
||||
}
|
||||
|
||||
bool IniSyntaxHighlighter::is_identifier(void* token) const
|
||||
bool IniSyntaxHighlighter::is_identifier(u64 token) const
|
||||
{
|
||||
auto ini_token = static_cast<GUI::IniToken::Type>(reinterpret_cast<size_t>(token));
|
||||
auto ini_token = static_cast<GUI::IniToken::Type>(token);
|
||||
return ini_token == GUI::IniToken::Type::Name;
|
||||
}
|
||||
|
||||
|
@ -53,7 +53,7 @@ void IniSyntaxHighlighter::rehighlight(const Palette& palette)
|
|||
span.attributes.color = style.color;
|
||||
span.attributes.bold = style.bold;
|
||||
span.is_skippable = token.m_type == IniToken::Type::Whitespace;
|
||||
span.data = reinterpret_cast<void*>(token.m_type);
|
||||
span.data = static_cast<u64>(token.m_type);
|
||||
spans.append(span);
|
||||
}
|
||||
m_client->do_set_spans(move(spans));
|
||||
|
@ -64,18 +64,18 @@ void IniSyntaxHighlighter::rehighlight(const Palette& palette)
|
|||
m_client->do_update();
|
||||
}
|
||||
|
||||
Vector<IniSyntaxHighlighter::MatchingTokenPair> IniSyntaxHighlighter::matching_token_pairs() const
|
||||
Vector<IniSyntaxHighlighter::MatchingTokenPair> IniSyntaxHighlighter::matching_token_pairs_impl() const
|
||||
{
|
||||
static Vector<MatchingTokenPair> pairs;
|
||||
if (pairs.is_empty()) {
|
||||
pairs.append({ reinterpret_cast<void*>(IniToken::Type::LeftBracket), reinterpret_cast<void*>(IniToken::Type::RightBracket) });
|
||||
pairs.append({ static_cast<u64>(IniToken::Type::LeftBracket), static_cast<u64>(IniToken::Type::RightBracket) });
|
||||
}
|
||||
return pairs;
|
||||
}
|
||||
|
||||
bool IniSyntaxHighlighter::token_types_equal(void* token1, void* token2) const
|
||||
bool IniSyntaxHighlighter::token_types_equal(u64 token1, u64 token2) const
|
||||
{
|
||||
return static_cast<GUI::IniToken::Type>(reinterpret_cast<size_t>(token1)) == static_cast<GUI::IniToken::Type>(reinterpret_cast<size_t>(token2));
|
||||
return static_cast<GUI::IniToken::Type>(token1) == static_cast<GUI::IniToken::Type>(token2);
|
||||
}
|
||||
|
||||
IniSyntaxHighlighter::~IniSyntaxHighlighter()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue