luau-lang/luau
1
0
Fork 0
mirror of https://github.com/luau-lang/luau.git synced 2025-05-04 10:33:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

Escape interpolated strings better

Browse source
This commit is contained in:
Kampfkarren 2022-07-28 17:45:02 -07:00
parent 3683436dbe
commit c8d7fd171f
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Ast/src/StringUtils.cpp
View file

@ -237,7 +237,7 @@ std::string escape(std::string_view s)
for (uint8_t c : s) for (uint8_t c : s)
{ {
if (c >= ' ' && c != '\\' && c != '\'' && c != '\"') if (c >= ' ' && c != '\\' && c != '\'' && c != '\"' && c != '`' && c != '{')
r += c; r += c;
else else
{ {
@ -272,6 +272,14 @@ std::string escape(std::string_view s)
case '\"': case '\"':
r += '\"'; r += '\"';
break; break;
// INTERP CODE REVIEW: This is going to apply it to all escaped strings, not just
// interpolated ones. Is that acceptable, or should this be split into two functions/a toggle?
case '`':
r += '`';
break;
case '{':
r += '{';
break;
case '\\': case '\\':
r += '\\'; r += '\\';
break; break;

9
tests/Transpiler.test.cpp
View file

@ -688,4 +688,13 @@ TEST_CASE_FIXTURE(Fixture, "transpile_string_interp")
CHECK_EQ(code, transpile(code, {}, true).code); CHECK_EQ(code, transpile(code, {}, true).code);
} }
TEST_CASE_FIXTURE(Fixture, "transpile_string_literal_escape")
{
ScopedFastFlag sff{"LuauInterpolatedStringBaseSupport", true};
std::string code = R"( local _ = ` bracket = \{, backtick = \` = {'ok'} ` )";
CHECK_EQ(code, transpile(code, {}, true).code);
}
TEST_SUITE_END(); TEST_SUITE_END();