Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a check if substitutions exists #46945

Merged
merged 12 commits into from
Aug 19, 2024
Merged

Add a check if substitutions exists #46945

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a435624
Add default value to `substitute_single` function
asamuzaK Jun 30, 2024
e2ff856
Update testharness.js
asamuzaK Jul 2, 2024
a7d7048
Remove unused capture in regexp
asamuzaK Jul 2, 2024
52fd880
Bring back capture
asamuzaK Jul 2, 2024
9474464
Update testharness.js
asamuzaK Jul 2, 2024
e75c5ce
Attempt remove capture again
asamuzaK Jul 2, 2024
fd67d48
Revert removing capture
asamuzaK Jul 2, 2024
9d109c1
Update testharness.js
asamuzaK Jul 2, 2024
a3762a2
Update testharness.js
asamuzaK Jul 2, 2024
f5e8457
Update testharness.js
asamuzaK Jul 3, 2024
12317a8
Update testharness.js
asamuzaK Jul 3, 2024
6ac8f4c
Check if substitutions exists
asamuzaK Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update testharness.js
  • Loading branch information
@asamuzaK
asamuzaK committed Jul 3, 2024
commit f5e84573fdf29602a797c0545d77cd5f67aff2bc
4 changes: 1 addition & 3 deletions resources/testharness.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4406,7 +4406,7 @@

function substitute_single(template, substitutions = {})
{
var substitution_re = /\$\{[^ }]*\}/g;
var substitution_re = /\$\{([^ }]*)\}/g;

function do_substitution(input)
{
Expand All @@ -4416,8 +4416,6 @@
rv.push(components[i]);
if (substitutions && components[i + 1]) {
rv.push(String(substitutions[components[i + 1]]));
} else {
break;
}
}
return rv;
Expand Down