Fix incorrectly escaped string.replace replace value (#892)

ark120202 · web-flow · commit f0410e0419a6 · 2020-06-10T18:13:41.000+02:00
* Fix incorrectly escaped `string.replace` replace value

* Add test with escaped char in search value and re-add removed test
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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.
diff --git a/src/lualib/StringReplace.ts b/src/lualib/StringReplace.ts
@@ -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 {
diff --git a/test/unit/builtins/string.spec.ts b/test/unit/builtins/string.spec.ts
@@ -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" },
 ])("string.replace (%p)", ({ inp, searchValue, replaceValue }) => {
     util.testExpression`"${inp}".replace(${util.formatCode(searchValue, replaceValue)})`.expectToMatchJsResult();
