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

LibSyntax+Userland: Make LibSyntax not depend on LibGUI

Browse source 
This moves some stuff around to make LibGUI depend on LibSyntax instead
of the other way around, as not every application that wishes to do
syntax highlighting is necessarily a LibGUI (or even a GUI) application.
This commit is contained in:
Ali Mohammad Pur 2023-08-29 12:43:41 +03:30 • committed by Tim Flynn
parent 2495302991
commit ba4db899d4
26 changed files with 773 additions and 683 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,10 +54,10 @@ void SyntaxHighlighter::rehighlight(Palette const& palette)
Lexer lexer(text);
Vector<GUI::TextDocumentSpan> spans;
Vector<GUI::TextDocumentFoldingRegion> folding_regions;
GUI::TextPosition position { 0, 0 };
GUI::TextPosition start { 0, 0 };
Vector<Syntax::TextDocumentSpan> spans;
Vector<Syntax::TextDocumentFoldingRegion> folding_regions;
Syntax::TextPosition position { 0, 0 };
Syntax::TextPosition start { 0, 0 };
auto advance_position = [&position](char ch) {
if (ch == '\n') {
@ -75,7 +75,7 @@ void SyntaxHighlighter::rehighlight(Palette const& palette)
for (size_t i = 0; i < str.length(); ++i)
advance_position(str[i]);
GUI::TextDocumentSpan span;
Syntax::TextDocumentSpan span;
span.range.set_start(start);
span.range.set_end({ position.line(), position.column() });
auto type = is_trivia ? TokenType::Invalid : token.type();
@ -94,7 +94,7 @@ void SyntaxHighlighter::rehighlight(Palette const& palette)
struct TokenData {
Token token;
GUI::TextRange range;
Syntax::TextRange range;
};
Vector<TokenData> folding_region_start_tokens;
@ -115,7 +115,7 @@ void SyntaxHighlighter::rehighlight(Palette const& palette)
} else if (token.type() == TokenType::CurlyClose) {
if (!folding_region_start_tokens.is_empty()) {
auto curly_open = folding_region_start_tokens.take_last();
GUI::TextDocumentFoldingRegion region;
Syntax::TextDocumentFoldingRegion region;
region.range.set_start(curly_open.range.end());
region.range.set_end(token_start_position);
folding_regions.append(region);