summaryrefslogtreecommitdiff
path: root/Userland/Applications
diff options
context:
space:
mode:
authorAli Mohammad Pur <ali.mpfard@gmail.com>2021-06-07 12:03:09 +0430
committerAli Mohammad Pur <Ali.mpfard@gmail.com>2021-06-07 14:45:49 +0430
commit71b4433b0d83714852e882a83808a7d4bbeb6117 (patch)
treede087995b3c2751c0297e05a8f5a9c4fb808d9ca /Userland/Applications
parent3bac14e19e6bf7df9019b71ff47aa34ab89e516f (diff)
downloadserenity-71b4433b0d83714852e882a83808a7d4bbeb6117.zip
LibWeb+LibSyntax: Implement nested syntax highlighters
And use them to highlight javascript in HTML source. This commit also changes how TextDocumentSpan::data is interpreted, as it used to be an opaque pointer, but everyone stuffed an enum value inside it, which made the values not unique to each highlighter; that field is now a u64 serial id. The syntax highlighters don't need to change their ways of stuffing token types into that field, but a highlighter that calls another nested highlighter needs to register the nested types for use with token pairs.
Diffstat (limited to 'Userland/Applications')
-rw-r--r--Userland/Applications/Spreadsheet/CellSyntaxHighlighter.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Userland/Applications/Spreadsheet/CellSyntaxHighlighter.cpp b/Userland/Applications/Spreadsheet/CellSyntaxHighlighter.cpp
index 4e74b7b6ae..bfdbe73c9c 100644
--- a/Userland/Applications/Spreadsheet/CellSyntaxHighlighter.cpp
+++ b/Userland/Applications/Spreadsheet/CellSyntaxHighlighter.cpp
@@ -31,7 +31,7 @@ void CellSyntaxHighlighter::rehighlight(const Palette& palette)
false,
false,
},
- nullptr,
+ (u64)-1,
false);
if (m_cell && m_cell->exception()) {
@@ -47,7 +47,7 @@ void CellSyntaxHighlighter::rehighlight(const Palette& palette)
false,
false,
},
- nullptr,
+ (u64)-1,
false });
}
m_client->do_update();