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

LibCpp: Use lex_iterable() where applicable

Browse source
This commit is contained in:
Itamar 2021-08-21 16:48:21 +03:00 • committed by Andreas Kling
parent 606e05852f
commit f91974677c
3 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -59,10 +59,9 @@ void SyntaxHighlighter::rehighlight(Palette const& palette)
{
auto text = m_client->get_text();
Cpp::Lexer lexer(text);
auto tokens = lexer.lex();
Vector<GUI::TextDocumentSpan> spans;
for (auto& token : tokens) {
lexer.lex_iterable([&](auto token) {
// FIXME: The +1 for the token end column is a quick hack due to not wanting to modify the lexer (which is also used by the parser). Maybe there's a better way to do this.
dbgln_if(SYNTAX_HIGHLIGHTING_DEBUG, "{} @ {}:{} - {}:{}", token.type_as_string(), token.start().line, token.start().column, token.end().line, token.end().column + 1);
GUI::TextDocumentSpan span;
@ -74,7 +73,7 @@ void SyntaxHighlighter::rehighlight(Palette const& palette)
span.is_skippable = token.type() == Cpp::Token::Type::Whitespace;
span.data = static_cast<u64>(token.type());
spans.append(span);
}
});
m_client->do_set_spans(move(spans));
m_has_brace_buddies = false;