mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 03:57:43 +00:00
LibSyntax+Userland: Make LibSyntax not depend on LibGUI
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:
parent
2495302991
commit
ba4db899d4
26 changed files with 773 additions and 683 deletions
|
@ -42,8 +42,8 @@ void SyntaxHighlighter::rehighlight(Palette const& palette)
|
|||
clear_nested_token_pairs();
|
||||
|
||||
// FIXME: Add folding regions for start and end tags.
|
||||
Vector<GUI::TextDocumentFoldingRegion> folding_regions;
|
||||
Vector<GUI::TextDocumentSpan> spans;
|
||||
Vector<Syntax::TextDocumentFoldingRegion> folding_regions;
|
||||
Vector<Syntax::TextDocumentSpan> spans;
|
||||
auto highlight = [&](auto start_line, auto start_column, auto end_line, auto end_column, Gfx::TextAttributes attributes, AugmentedTokenKind kind) {
|
||||
if (start_line > end_line || (start_line == end_line && start_column >= end_column)) {
|
||||
dbgln_if(SYNTAX_HIGHLIGHTING_DEBUG, "(HTML::SyntaxHighlighter) discarding ({}-{}) to ({}-{}) because it has zero or negative length", start_line, start_column, end_line, end_column);
|
||||
|
@ -51,7 +51,7 @@ void SyntaxHighlighter::rehighlight(Palette const& palette)
|
|||
}
|
||||
dbgln_if(SYNTAX_HIGHLIGHTING_DEBUG, "(HTML::SyntaxHighlighter) highlighting ({}-{}) to ({}-{}) with color {}", start_line, start_column, end_line, end_column, attributes.color);
|
||||
spans.empend(
|
||||
GUI::TextRange {
|
||||
Syntax::TextRange {
|
||||
{ start_line, start_column },
|
||||
{ end_line, end_column },
|
||||
},
|
||||
|
@ -67,7 +67,7 @@ void SyntaxHighlighter::rehighlight(Palette const& palette)
|
|||
CSS,
|
||||
} state { State::HTML };
|
||||
StringBuilder substring_builder;
|
||||
GUI::TextPosition substring_start_position;
|
||||
Syntax::TextPosition substring_start_position;
|
||||
|
||||
for (;;) {
|
||||
auto token = tokenizer.next_token();
|
||||
|
@ -141,7 +141,7 @@ void SyntaxHighlighter::rehighlight(Palette const& palette)
|
|||
{ palette.syntax_comment(), {} },
|
||||
AugmentedTokenKind::Comment);
|
||||
|
||||
GUI::TextDocumentFoldingRegion region;
|
||||
Syntax::TextDocumentFoldingRegion region;
|
||||
region.range.set_start({ token->start_position().line, token->start_position().column + comment_prefix()->length() });
|
||||
region.range.set_end({ token->end_position().line, token->end_position().column - comment_suffix()->length() });
|
||||
folding_regions.append(move(region));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue