RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 04:37:40 +00:00
Code Issues Activity Actions

LibJS: Unbreak test262-parser-tests after source range caching changes

Browse source 
Turns out we have to be a little more lenient when dealing with the
slightly hostile inputs in tests262-parser-tests.

This fix papers over some problematic situations by returning a fallback
range if we can't figure out exactly where an error occurred.
I've added a FIXME about returning nicer values.
This commit is contained in:
Andreas Kling 2022-11-24 18:01:52 +01:00
parent d16fab5815
commit c922d21ecb
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Userland/Libraries/LibJS/SourceCode.cpp
View file

@ -54,8 +54,9 @@ void SourceCode::compute_line_break_offsets() const
SourceRange SourceCode::range_from_offsets(u32 start_offset, u32 end_offset) const SourceRange SourceCode::range_from_offsets(u32 start_offset, u32 end_offset) const
{ {
// If the underlying code is an empty string, the range is 1,1 - 1,1 no matter what.
if (m_code.is_empty()) if (m_code.is_empty())
return { *this, {}, {} }; return { *this, { .line = 1, .column = 1, .offset = 0 }, { .line = 1, .column = 1, .offset = 0 } };
if (!m_line_break_offsets.has_value()) if (!m_line_break_offsets.has_value())
compute_line_break_offsets(); compute_line_break_offsets();
@ -70,8 +71,8 @@ SourceRange SourceCode::range_from_offsets(u32 start_offset, u32 end_offset) con
nearest_preceding_line_break_offset = (*m_line_break_offsets)[nearest_line_break_index]; nearest_preceding_line_break_offset = (*m_line_break_offsets)[nearest_line_break_index];
} }
Position start; Optional<Position> start;
Position end; Optional<Position> end;
size_t column = 1; size_t column = 1;
@ -80,7 +81,8 @@ SourceRange SourceCode::range_from_offsets(u32 start_offset, u32 end_offset) con
Utf8View view(m_code.view()); Utf8View view(m_code.view());
for (auto it = view.iterator_at_byte_offset_without_validation(nearest_preceding_line_break_offset); it != view.end(); ++it) { for (auto it = view.iterator_at_byte_offset_without_validation(nearest_preceding_line_break_offset); it != view.end(); ++it) {
if (start_offset == view.byte_offset_of(it)) { // If we're on or after the start offset, this is the start position.
if (!start.has_value() && view.byte_offset_of(it) >= start_offset) {
start = Position { start = Position {
.line = line, .line = line,
.column = column, .column = column,
@ -88,7 +90,8 @@ SourceRange SourceCode::range_from_offsets(u32 start_offset, u32 end_offset) con
}; };
} }
if (end_offset == view.byte_offset_of(it)) { // If we're on or after the end offset, this is the end position.
if (!end.has_value() && view.byte_offset_of(it) >= end_offset) {
end = Position { end = Position {
.line = line, .line = line,
.column = column, .column = column,
@ -110,7 +113,12 @@ SourceRange SourceCode::range_from_offsets(u32 start_offset, u32 end_offset) con
++column; ++column;
} }
return SourceRange { *this, start, end }; // If we didn't find both a start and end position, just return 1,1-1,1.
// FIXME: This is a hack. Find a way to return the nicest possible values here.
if (!start.has_value() || !end.has_value())
return SourceRange { *this, { .line = 1, .column = 1 }, { .line = 1, .column = 1 } };
return SourceRange { *this, *start, *end };
} }
} }