Skip to content

Improve string.replace implementation #549

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 1 commit into from
May 2, 2019
Merged

Improve string.replace implementation #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 21 additions & 2 deletions src/lualib/StringReplace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
function __TS__StringReplace(this: void, source: string, searchValue: string, replaceValue: string): string {
return string.gsub(source, searchValue, replaceValue)[0];
function __TS__StringReplace(
this: void,
source: string,
searchValue: string,
replaceValue: string | ((substring: string) => string)
): string {
[searchValue] = string.gsub(searchValue, "[%%%(%)%.%+%-%*%?%[%^%$]", "%%%1");

if (typeof replaceValue === "string") {
[replaceValue] = string.gsub(replaceValue, "[%%%(%)%.%+%-%*%?%[%^%$]", "%%%1");
const [result] = string.gsub(source, searchValue, replaceValue, 1);
return result;
} else {
const [result] = string.gsub(
source,
searchValue,
match => (replaceValue as (substring: string) => string)(match),
1
);
return result;
}
}
11 changes: 7 additions & 4 deletions src/lualib/declarations/string.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
/** @luaIterator */
interface GMatchResult extends Array<string> { }
interface GMatchResult extends Array<string> {}

/** @noSelf */
declare namespace string {
/** @tupleReturn */
function gsub(source: string, searchValue: string, replaceValue: string): [string, number];
/** @tupleReturn */
function gsub(source: string, searchValue: string, replaceValue: (...groups: string[]) => string): [string, number];
function gsub(
source: string,
searchValue: string,
replaceValue: string | ((...groups: string[]) => string),
n?: number
): [string, number];

function gmatch(haystack: string, pattern: string): GMatchResult;
}
17 changes: 15 additions & 2 deletions test/unit/string.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,25 @@ test.each([
{ inp: "hello test", searchValue: "hello", replaceValue: "" },
{ 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: "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: "aaa", searchValue: "a", replaceValue: "b" },
])("string.replace (%p)", ({ inp, searchValue, replaceValue }) => {
const replaceValueString =
typeof replaceValue === "string" ? JSON.stringify(replaceValue) : replaceValue.toString();
const result = util.transpileAndExecute(
`return "${inp}".replace("${searchValue}", "${replaceValue}");`,
`return "${inp}".replace("${searchValue}", ${replaceValueString});`,
);

expect(result).toBe(inp.replace(searchValue, replaceValue));
// https://github.com/Microsoft/TypeScript/issues/22378
if (typeof replaceValue === "string") {
expect(result).toBe(inp.replace(searchValue, replaceValue));
} else {
expect(result).toBe(inp.replace(searchValue, replaceValue));
}
});

test.each([
Expand Down