system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-09-06 17:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibJS: Behave like major engines when substituting missing capture group

Browse source 
When a substitution refers to a 2-digit capture group that doesn't exist
we need to check if the first digit refers to an existing capture group.
In other words, '$10' should be treated as capture group #1, followed by
the literal '0' if 1 is a valid capture group but 10 is not.

This makes the Dromaeo "dom-query" subtest run to completion.
This commit is contained in:
Andreas Kling 2023-08-28 23:40:30 +02:00
parent b5ed86ab68
commit 9d6f00d918
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Userland/Libraries/LibJS/Runtime/AbstractOperations.cpp
View file

@ -1269,6 +1269,15 @@ ThrowCompletionOr<String> get_substitution(VM& vm, Utf16View const& matched, Utf
auto capture_position_string = TRY_OR_THROW_OOM(vm, replace_view.substring_view(i + 1, is_two_digits ? 2 : 1).to_utf8());
auto capture_position = capture_position_string.to_number<u32>();
// NOTE: All major engines treat $10 as $1 followed by a literal '0' character
// if there are fewer than 10 capture groups. The spec disagrees.
// Spec bug: https://github.com/tc39/ecma262/issues/1426
if (is_two_digits && capture_position.has_value() && (*capture_position > 0) && (*capture_position > captures.size())) {
is_two_digits = false;
capture_position_string = MUST(capture_position_string.substring_from_byte_offset(0, 1));
capture_position = capture_position_string.to_number<u32>();
}
if (capture_position.has_value() && (*capture_position > 0) && (*capture_position <= captures.size())) {
auto& value = captures[*capture_position - 1];

6
Userland/Libraries/LibJS/Tests/builtins/String/String.prototype.replace.js
View file

@ -248,3 +248,9 @@ test("UTF-16", () => {
expect("".replace("", "😀")).toBe("😀");
});
test("substitution with capture group", () => {
expect("A".replace(/(A)/, "$1")).toBe("A");
expect("A".replace(/(A)/, "$10")).toBe("A0");
expect("A".replace(/(A)/, "$2")).toBe("$2");
});