mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-01-08 12:19:37 +03:00
3e1626acdc
Function `CellSyntaxHighlighter::rehighlight()` direct inserted spans to TextDocument `m_span` vector missing out important reordering and merging operation carried out by `TextDocument::set_spans()`. This caused overlapping spans for a cell with only a `=` symbol (one for the actual token and one for the highlighting) to miscalculate `start` and `end` value and a `length` value (of `size_t` type) with a `0-1` substraction (result: 18446744073709551615) causing `Utf32View::substring_view()` to fail the `!Checked<size_t>::addition_would_overflow(offset, length)` assertion This remove the possibility to directly alter `TextDocument`'s spans thus forcing the utilization of `HighlighterClient::do_set_spans()` interface function. Proper refactor have been applied to `CellSyntaxHighlighter::rehighlight()` function
60 lines
1.7 KiB
C++
60 lines
1.7 KiB
C++
/*
|
|
* Copyright (c) 2020-2022, the SerenityOS developers.
|
|
* Copyright (c) 2023, Matteo benetti <matteo.benetti@proton.me>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include "CellSyntaxHighlighter.h"
|
|
#include <LibGUI/TextEditor.h>
|
|
#include <LibGfx/Palette.h>
|
|
#include <LibJS/Lexer.h>
|
|
|
|
namespace Spreadsheet {
|
|
|
|
void CellSyntaxHighlighter::rehighlight(Palette const& palette)
|
|
{
|
|
m_client->clear_spans();
|
|
|
|
if (m_client->get_text().starts_with('=')) {
|
|
|
|
JS::SyntaxHighlighter::rehighlight(palette);
|
|
|
|
auto spans = m_client->spans();
|
|
|
|
// Highlight the '='
|
|
spans.empend(
|
|
GUI::TextRange { { 0, 0 }, { 0, 1 } },
|
|
Gfx::TextAttributes {
|
|
palette.syntax_keyword(),
|
|
Optional<Color> {},
|
|
false,
|
|
},
|
|
(u64)-1,
|
|
false);
|
|
|
|
if (m_cell && m_cell->thrown_value().has_value()) {
|
|
if (auto value = m_cell->thrown_value().value(); value.is_object() && is<JS::Error>(value.as_object())) {
|
|
auto& error = static_cast<JS::Error const&>(value.as_object());
|
|
auto& range = error.traceback().first().source_range;
|
|
|
|
spans.prepend({
|
|
GUI::TextRange { { range.start.line - 1, range.start.column }, { range.end.line - 1, range.end.column } },
|
|
Gfx::TextAttributes {
|
|
Color::Black,
|
|
Color::Red,
|
|
false,
|
|
},
|
|
(u64)-1,
|
|
false,
|
|
});
|
|
}
|
|
}
|
|
|
|
m_client->do_set_spans(move(spans));
|
|
}
|
|
|
|
m_client->do_update();
|
|
}
|
|
}
|