beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-29 08:11:13 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibSyntax+Libraries: Replace TextStyle with Gfx::TextAttributes

Browse source 
Rather than creating a TextStyle struct, and then copying its fields
over to a TextAttributes, let's just create a TextAttributes to start
with. This also simplifies the syntax highlighting code by letting us
define underlines along with the other text styling.
This commit is contained in:
Sam Atkins 2023-03-15 12:49:17 +00:00 committed by Andreas Kling
parent 6d8f046fd0
commit 406a7ea577
Notes: sideshowbarker 2024-07-17 02:08:15 +09:00 
Author: https://github.com/AtkinsSJ
Commit: https://github.com/SerenityOS/serenity/commit/406a7ea577
Pull-request: https://github.com/SerenityOS/serenity/pull/17866
10 changed files with 59 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Userland/Libraries/LibCMake/CMakeCache/SyntaxHighlighter.cpp
View file

@ -9,7 +9,7 @@
namespace CMake::Cache {
static Syntax::TextStyle style_for_token_type(Gfx::Palette const& palette, Token::Type type)
static Gfx::TextAttributes style_for_token_type(Gfx::Palette const& palette, Token::Type type)
{
switch (type) {
case Token::Type::Comment:
@ -25,7 +25,7 @@ static Syntax::TextStyle style_for_token_type(Gfx::Palette const& palette, Token
case Token::Type::Value:
return { palette.syntax_string() };
case Token::Type::Garbage:
return { palette.red() };
return { palette.red(), {}, false, Gfx::TextAttributes::UnderlineStyle::Wavy, palette.red() };
default:
return { palette.base_text() };
}
@ -50,13 +50,7 @@ void SyntaxHighlighter::rehighlight(Gfx::Palette const& palette)
if (!span.range.is_valid())
return;
auto style = style_for_token_type(palette, type);
span.attributes.color = style.color;
span.attributes.bold = style.bold;
if (type == Token::Type::Garbage) {
span.attributes.underline_color = palette.red();
span.attributes.underline_style = Gfx::TextAttributes::UnderlineStyle::Wavy;
}
span.attributes = style_for_token_type(palette, type);
span.is_skippable = false;
span.data = static_cast<u64>(type);
spans.append(move(span));

12
Userland/Libraries/LibCMake/SyntaxHighlighter.cpp
View file

@ -10,7 +10,7 @@
namespace CMake {
static Syntax::TextStyle style_for_token_type(Gfx::Palette const& palette, Token::Type type)
static Gfx::TextAttributes style_for_token_type(Gfx::Palette const& palette, Token::Type type)
{
switch (type) {
case Token::Type::BracketComment:
@ -30,7 +30,7 @@ static Syntax::TextStyle style_for_token_type(Gfx::Palette const& palette, Token
case Token::Type::UnquotedArgument:
return { palette.syntax_parameter() };
case Token::Type::Garbage:
return { palette.red() };
return { palette.red(), {}, false, Gfx::TextAttributes::UnderlineStyle::Wavy, palette.red() };
case Token::Type::VariableReference:
// This is a bit arbitrary, since we don't have a color specifically for this.
return { palette.syntax_preprocessor_value() };
@ -66,13 +66,7 @@ void SyntaxHighlighter::rehighlight(Gfx::Palette const& palette)
if (!span.range.is_valid())
return;
auto style = style_for_token_type(palette, type);
span.attributes.color = style.color;
span.attributes.bold = style.bold;
if (type == Token::Type::Garbage) {
span.attributes.underline_color = palette.red();
span.attributes.underline_style = Gfx::TextAttributes::UnderlineStyle::Wavy;
}
span.attributes = style_for_token_type(palette, type);
span.is_skippable = false;
span.data = static_cast<u64>(type);
spans.append(move(span));

40
Userland/Libraries/LibCpp/SemanticSyntaxHighlighter.cpp
View file

@ -85,44 +85,44 @@ void SemanticSyntaxHighlighter::rehighlight(Palette const& palette)
update_spans(new_tokens_info, palette);
}
static Syntax::TextStyle style_for_token_type(Gfx::Palette const& palette, CodeComprehension::TokenInfo::SemanticType type)
static Gfx::TextAttributes style_for_token_type(Gfx::Palette const& palette, CodeComprehension::TokenInfo::SemanticType type)
{
switch (type) {
case CodeComprehension::TokenInfo::SemanticType::Unknown:
return { palette.base_text(), false };
return { palette.base_text() };
case CodeComprehension::TokenInfo::SemanticType::Keyword:
return { palette.syntax_keyword(), true };
return { palette.syntax_keyword(), {}, true };
case CodeComprehension::TokenInfo::SemanticType::Type:
return { palette.syntax_type(), true };
return { palette.syntax_type(), {}, true };
case CodeComprehension::TokenInfo::SemanticType::Identifier:
return { palette.syntax_identifier(), false };
return { palette.syntax_identifier() };
case CodeComprehension::TokenInfo::SemanticType::String:
return { palette.syntax_string(), false };
return { palette.syntax_string() };
case CodeComprehension::TokenInfo::SemanticType::Number:
return { palette.syntax_number(), false };
return { palette.syntax_number() };
case CodeComprehension::TokenInfo::SemanticType::IncludePath:
return { palette.syntax_preprocessor_value(), false };
return { palette.syntax_preprocessor_value() };
case CodeComprehension::TokenInfo::SemanticType::PreprocessorStatement:
return { palette.syntax_preprocessor_statement(), false };
return { palette.syntax_preprocessor_statement() };
case CodeComprehension::TokenInfo::SemanticType::Comment:
return { palette.syntax_comment(), false };
return { palette.syntax_comment() };
case CodeComprehension::TokenInfo::SemanticType::Function:
return { palette.syntax_function(), false };
return { palette.syntax_function() };
case CodeComprehension::TokenInfo::SemanticType::Variable:
return { palette.syntax_variable(), false };
return { palette.syntax_variable() };
case CodeComprehension::TokenInfo::SemanticType::CustomType:
return { palette.syntax_custom_type(), false };
return { palette.syntax_custom_type() };
case CodeComprehension::TokenInfo::SemanticType::Namespace:
return { palette.syntax_namespace(), false };
return { palette.syntax_namespace() };
case CodeComprehension::TokenInfo::SemanticType::Member:
return { palette.syntax_member(), false };
return { palette.syntax_member() };
case CodeComprehension::TokenInfo::SemanticType::Parameter:
return { palette.syntax_parameter(), false };
return { palette.syntax_parameter() };
case CodeComprehension::TokenInfo::SemanticType::PreprocessorMacro:
return { palette.syntax_preprocessor_value(), false };
return { palette.syntax_preprocessor_value() };
default:
VERIFY_NOT_REACHED();
return { palette.base_text(), false };
return { palette.base_text() };
}
}
void SemanticSyntaxHighlighter::update_spans(Vector<CodeComprehension::TokenInfo> const& tokens_info, Gfx::Palette const& palette)
@ -133,9 +133,7 @@ void SemanticSyntaxHighlighter::update_spans(Vector<CodeComprehension::TokenInfo
GUI::TextDocumentSpan span;
span.range.set_start({ token.start_line, token.start_column });
span.range.set_end({ token.end_line, token.end_column + 1 });
auto style = style_for_token_type(palette, token.type);
span.attributes.color = style.color;
span.attributes.bold = style.bold;
span.attributes = style_for_token_type(palette, token.type);
span.is_skippable = token.type == CodeComprehension::TokenInfo::SemanticType::Whitespace;
span.data = static_cast<u64>(token.type);
spans.append(span);

26
Userland/Libraries/LibCpp/SyntaxHighlighter.cpp
View file

@ -13,33 +13,33 @@
namespace Cpp {
static Syntax::TextStyle style_for_token_type(Gfx::Palette const& palette, Cpp::Token::Type type)
static Gfx::TextAttributes style_for_token_type(Gfx::Palette const& palette, Cpp::Token::Type type)
{
switch (type) {
case Cpp::Token::Type::Keyword:
return { palette.syntax_keyword(), true };
return { palette.syntax_keyword(), {}, true };
case Cpp::Token::Type::KnownType:
return { palette.syntax_type(), true };
return { palette.syntax_type(), {}, true };
case Cpp::Token::Type::Identifier:
return { palette.syntax_identifier(), false };
return { palette.syntax_identifier() };
case Cpp::Token::Type::DoubleQuotedString:
case Cpp::Token::Type::SingleQuotedString:
case Cpp::Token::Type::RawString:
return { palette.syntax_string(), false };
return { palette.syntax_string() };
case Cpp::Token::Type::Integer:
case Cpp::Token::Type::Float:
return { palette.syntax_number(), false };
return { palette.syntax_number() };
case Cpp::Token::Type::IncludePath:
return { palette.syntax_preprocessor_value(), false };
return { palette.syntax_preprocessor_value() };
case Cpp::Token::Type::EscapeSequence:
return { palette.syntax_keyword(), true };
return { palette.syntax_keyword(), {}, true };
case Cpp::Token::Type::PreprocessorStatement:
case Cpp::Token::Type::IncludeStatement:
return { palette.syntax_preprocessor_statement(), false };
return { palette.syntax_preprocessor_statement() };
case Cpp::Token::Type::Comment:
return { palette.syntax_comment(), false };
return { palette.syntax_comment() };
default:
return { palette.base_text(), false };
return { palette.base_text() };
}
}
@ -69,9 +69,7 @@ void SyntaxHighlighter::rehighlight(Palette const& palette)
GUI::TextDocumentSpan span;
span.range.set_start({ token.start().line, token.start().column });
span.range.set_end({ token.end().line, token.end().column + 1 });
auto style = style_for_token_type(palette, token.type());
span.attributes.color = style.color;
span.attributes.bold = style.bold;
span.attributes = style_for_token_type(palette, token.type());
span.is_skippable = token.type() == Cpp::Token::Type::Whitespace;
span.data = static_cast<u64>(token.type());
spans.append(span);

8
Userland/Libraries/LibGUI/GML/SyntaxHighlighter.cpp
View file

@ -12,7 +12,7 @@
namespace GUI::GML {
static Syntax::TextStyle style_for_token_type(Gfx::Palette const& palette, Token::Type type)
static Gfx::TextAttributes style_for_token_type(Gfx::Palette const& palette, Token::Type type)
{
switch (type) {
case Token::Type::LeftCurly:
@ -21,7 +21,7 @@ static Syntax::TextStyle style_for_token_type(Gfx::Palette const& palette, Token
case Token::Type::ClassMarker:
return { palette.syntax_keyword() };
case Token::Type::ClassName:
return { palette.syntax_identifier(), true };
return { palette.syntax_identifier(), {}, true };
case Token::Type::Identifier:
return { palette.syntax_identifier() };
case Token::Type::JsonValue:
@ -54,9 +54,7 @@ void SyntaxHighlighter::rehighlight(Palette const& palette)
GUI::TextDocumentSpan span;
span.range.set_start({ token.m_start.line, token.m_start.column });
span.range.set_end({ token.m_end.line, token.m_end.column });
auto style = style_for_token_type(palette, token.m_type);
span.attributes.color = style.color;
span.attributes.bold = style.bold;
span.attributes = style_for_token_type(palette, token.m_type);
span.is_skippable = false;
span.data = static_cast<u64>(token.m_type);
spans.append(span);

6
Userland/Libraries/LibGUI/GitCommitSyntaxHighlighter.cpp
View file

@ -10,7 +10,7 @@
#include <LibGfx/Palette.h>
namespace GUI {
static Syntax::TextStyle style_for_token_type(Gfx::Palette const& palette, GitCommitToken::Type type)
static Gfx::TextAttributes style_for_token_type(Gfx::Palette const& palette, GitCommitToken::Type type)
{
switch (type) {
case GitCommitToken::Type::Comment:
@ -31,9 +31,7 @@ void GitCommitSyntaxHighlighter::rehighlight(Palette const& palette)
GUI::TextDocumentSpan span;
span.range.set_start({ token.m_start.line, token.m_start.column });
span.range.set_end({ token.m_end.line, token.m_end.column });
auto style = style_for_token_type(palette, token.m_type);
span.attributes.color = style.color;
span.attributes.bold = style.bold;
span.attributes = style_for_token_type(palette, token.m_type);
span.is_skippable = false;
span.data = static_cast<u64>(token.m_type);
spans.append(span);

10
Userland/Libraries/LibGUI/INISyntaxHighlighter.cpp
View file

@ -11,13 +11,13 @@
namespace GUI {
static Syntax::TextStyle style_for_token_type(Gfx::Palette const& palette, IniToken::Type type)
static Gfx::TextAttributes style_for_token_type(Gfx::Palette const& palette, IniToken::Type type)
{
switch (type) {
case IniToken::Type::LeftBracket:
case IniToken::Type::RightBracket:
case IniToken::Type::Section:
return { palette.syntax_keyword(), true };
return { palette.syntax_keyword(), {}, true };
case IniToken::Type::Name:
return { palette.syntax_identifier() };
case IniToken::Type::Value:
@ -25,7 +25,7 @@ static Syntax::TextStyle style_for_token_type(Gfx::Palette const& palette, IniTo
case IniToken::Type::Comment:
return { palette.syntax_comment() };
case IniToken::Type::Equal:
return { palette.syntax_operator(), true };
return { palette.syntax_operator(), {}, true };
default:
return { palette.base_text() };
}
@ -52,9 +52,7 @@ void IniSyntaxHighlighter::rehighlight(Palette const& palette)
GUI::TextDocumentSpan span;
span.range.set_start({ token.m_start.line, token.m_start.column });
span.range.set_end({ token.m_end.line, token.m_end.column });
auto style = style_for_token_type(palette, token.m_type);
span.attributes.color = style.color;
span.attributes.bold = style.bold;
span.attributes = style_for_token_type(palette, token.m_type);
span.is_skippable = token.m_type == IniToken::Type::Whitespace;
span.data = static_cast<u64>(token.m_type);
spans.append(span);

10
Userland/Libraries/LibJS/SyntaxHighlighter.cpp
View file

@ -13,7 +13,7 @@
namespace JS {
static Syntax::TextStyle style_for_token_type(Gfx::Palette const& palette, TokenType type)
static Gfx::TextAttributes style_for_token_type(Gfx::Palette const& palette, TokenType type)
{
switch (Token::category(type)) {
case TokenCategory::Invalid:
@ -27,9 +27,9 @@ static Syntax::TextStyle style_for_token_type(Gfx::Palette const& palette, Token
case TokenCategory::Operator:
return { palette.syntax_operator() };
case TokenCategory::Keyword:
return { palette.syntax_keyword(), true };
return { palette.syntax_keyword(), {}, true };
case TokenCategory::ControlKeyword:
return { palette.syntax_control_keyword(), true };
return { palette.syntax_control_keyword(), {}, true };
case TokenCategory::Identifier:
return { palette.syntax_identifier() };
default:
@ -79,9 +79,7 @@ void SyntaxHighlighter::rehighlight(Palette const& palette)
span.range.set_start(start);
span.range.set_end({ position.line(), position.column() });
auto type = is_trivia ? TokenType::Invalid : token.type();
auto style = style_for_token_type(palette, type);
span.attributes.color = style.color;
span.attributes.bold = style.bold;
span.attributes = style_for_token_type(palette, type);
span.is_skippable = is_trivia;
span.data = static_cast<u64>(type);
spans.append(span);

20
Userland/Libraries/LibSQL/AST/SyntaxHighlighter.cpp
View file

@ -12,25 +12,25 @@
namespace SQL::AST {
static Syntax::TextStyle style_for_token_type(Gfx::Palette const& palette, TokenType type)
static Gfx::TextAttributes style_for_token_type(Gfx::Palette const& palette, TokenType type)
{
switch (Token::category(type)) {
case TokenCategory::Keyword:
return { palette.syntax_keyword(), true };
return { palette.syntax_keyword(), {}, true };
case TokenCategory::Identifier:
return { palette.syntax_identifier(), false };
return { palette.syntax_identifier() };
case TokenCategory::Number:
return { palette.syntax_number(), false };
return { palette.syntax_number() };
case TokenCategory::Blob:
case TokenCategory::String:
return { palette.syntax_string(), false };
return { palette.syntax_string() };
case TokenCategory::Operator:
return { palette.syntax_operator(), false };
return { palette.syntax_operator() };
case TokenCategory::Punctuation:
return { palette.syntax_punctuation(), false };
return { palette.syntax_punctuation() };
case TokenCategory::Invalid:
default:
return { palette.base_text(), false };
return { palette.base_text() };
}
}
@ -54,9 +54,7 @@ void SyntaxHighlighter::rehighlight(Palette const& palette)
GUI::TextDocumentSpan span;
span.range.set_start({ token.start_position().line - 1, token.start_position().column - 1 });
span.range.set_end({ token.end_position().line - 1, token.end_position().column - 1 });
auto style = style_for_token_type(palette, token.type());
span.attributes.color = style.color;
span.attributes.bold = style.bold;
span.attributes = style_for_token_type(palette, token.type());
span.data = static_cast<u64>(token.type());
spans.append(span);

5
Userland/Libraries/LibSyntax/Highlighter.h
View file

@ -15,11 +15,6 @@
namespace Syntax {
struct TextStyle {
const Gfx::Color color;
bool const bold { false };
};
class Highlighter {
AK_MAKE_NONCOPYABLE(Highlighter);
AK_MAKE_NONMOVABLE(Highlighter);