mirrors/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-04-20 19:45:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibJS+LibWebView: Treat trivia tokens as comments

Browse source 
Trivia is whatever whitespace and comments appear before a token.
Previously this was always given a TokenCategory of Invalid, so it
would be displayed as an error in the view-source page, with red wiggly
underlines. Instead, treat it as what it actually is: whitespace and
comments!
This commit is contained in:
Sam Atkins 2025-03-04 16:36:34 +00:00 • committed by Tim Flynn
parent 38c1ac767d
commit 9b7fb0850d
Notes: github-actions[bot] 2025-03-04 20:59:17 +00:00
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibJS/SyntaxHighlighter.cpp
View file

@ -78,7 +78,7 @@ void SyntaxHighlighter::rehighlight(Palette const& palette)
Syntax::TextDocumentSpan span;
span.range.set_start(start);
span.range.set_end({ position.line(), position.column() });
auto type = is_trivia ? TokenType::Invalid : token.type();
auto type = is_trivia ? TokenType::Trivia : token.type();
span.attributes = style_for_token_type(palette, type);
span.is_skippable = is_trivia;
span.data = static_cast<u64>(type);

2
Libraries/LibJS/Token.h
View file

@ -145,6 +145,7 @@ constexpr u32 const ZERO_WIDTH_JOINER { 0x200D };
__ENUMERATE_JS_TOKEN(Throw, ControlKeyword) \
__ENUMERATE_JS_TOKEN(Tilde, Operator) \
__ENUMERATE_JS_TOKEN(TripleDot, Operator) \
__ENUMERATE_JS_TOKEN(Trivia, Trivia) \
__ENUMERATE_JS_TOKEN(Try, ControlKeyword) \
__ENUMERATE_JS_TOKEN(Typeof, Keyword) \
__ENUMERATE_JS_TOKEN(UnsignedShiftRight, Operator) \
@ -168,6 +169,7 @@ constexpr size_t cs_num_of_js_tokens = static_cast<size_t>(TokenType::_COUNT_OF_
enum class TokenCategory {
Invalid,
Trivia,
Number,
String,
Punctuation,

2
Libraries/LibWebView/SourceHighlighter.cpp
View file

@ -205,6 +205,8 @@ StringView SourceHighlighterClient::class_for_token(u64 token_type) const
switch (category) {
case JS::TokenCategory::Invalid:
return "invalid"sv;
case JS::TokenCategory::Trivia:
return "comment"sv;
case JS::TokenCategory::Number:
return "number"sv;
case JS::TokenCategory::String: