Skip to content

Fix incorrectly escaped string.replace replace value #892

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

Merged
Perryvw merged 3 commits into from
Jun 10, 2020
Merged

Fix incorrectly escaped string.replace replace value #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ae3ab4
Fix incorrectly escaped `string.replace` replace value
ark120202 Jun 1, 2020
61ef9cb
Add test with escaped char in search value and re-add removed test
ark120202 Jun 9, 2020
ec2c991
Merge branch 'master' into string-replace-value-escape
ark120202 Jun 10, 2020
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

- `Function.length` is supported now

- Fixed `string.replace` incorrectly escaping some `replaceValue` characters (`().+-*?[^$`)

## 0.34.0

- Added new `"luaTarget"` option value - `"universal"`. Choosing this target makes TypeScriptToLua generate code compatible with all supported Lua targets.
Expand Down
2 changes: 1 addition & 1 deletion src/lualib/StringReplace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function __TS__StringReplace(
[searchValue] = string.gsub(searchValue, "[%%%(%)%.%+%-%*%?%[%^%$]", "%%%1");

if (typeof replaceValue === "string") {
[replaceValue] = string.gsub(replaceValue, "[%%%(%)%.%+%-%*%?%[%^%$]", "%%%1");
[replaceValue] = string.gsub(replaceValue, "%%", "%%%%");
const [result] = string.gsub(source, searchValue, replaceValue, 1);
return result;
} else {
Expand Down
6 changes: 4 additions & 2 deletions test/unit/builtins/string.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,12 @@ test.each([
{ inp: "hello test", searchValue: "test", replaceValue: "" },
{ inp: "hello test", searchValue: "test", replaceValue: "world" },
{ inp: "hello test", searchValue: "test", replaceValue: "%world" },
{ inp: "hello test", searchValue: "test", replaceValue: "." },
{ inp: "hello %test", searchValue: "test", replaceValue: "world" },
{ inp: "hello %test", searchValue: "%test", replaceValue: "world" },
{ inp: "hello test", searchValue: "test", replaceValue: (): string => "a" },
{ inp: "hello test", searchValue: "test", replaceValue: (): string => "%a" },
{ inp: "hello test.", searchValue: ".", replaceValue: "$" },
{ inp: "hello test", searchValue: "test", replaceValue: () => "a" },
{ inp: "hello test", searchValue: "test", replaceValue: () => "%a" },
{ inp: "aaa", searchValue: "a", replaceValue: "b" },
Copy link
Copy Markdown
Member

@Perryvw Perryvw Jun 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you remove this? I don't think there is another test that replaces multiple references in the same string.

])("string.replace (%p)", ({ inp, searchValue, replaceValue }) => {
util.testExpression`"${inp}".replace(${util.formatCode(searchValue, replaceValue)})`.expectToMatchJsResult();
Expand Down