Skip to content

Commit 43661fd

Browse files
committed
fix textFormat
1 parent 2372322 commit 43661fd

File tree

2 files changed

+38
-1
lines changed

2 files changed

+38
-1
lines changed

sources/libcore/assets/texts.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ namespace cage
273273

274274
String textFormat(String res, const String &params)
275275
{
276-
uint32 pc = 1;
276+
uint32 pc = 0;
277277
for (char c : params)
278278
pc += c == '|';
279279

sources/test-core/strings.cpp

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -928,6 +928,43 @@ namespace
928928
CAGE_TEST(textFormat("abc{def}ghi", "def") == "abcghi");
929929
CAGE_TEST(textFormat("{3}def{2}", "hola|ho|ghi|abc|jey") == "abcdefghi");
930930
CAGE_TEST(textFormat("abc{10}ghi", "def|juj") == "abcghi");
931+
CAGE_TEST(textFormat("a {1} b", "") == "a b");
932+
CAGE_TEST(textFormat("a {-1} b", "") == "a b");
933+
CAGE_TEST(textFormat("a {0} b", "") == "a b");
934+
CAGE_TEST(textFormat("a {w} b", "") == "a b");
935+
CAGE_TEST(textFormat("a {} b", "") == "a b");
936+
CAGE_TEST(textFormat("a { } b", "") == "a b");
937+
CAGE_TEST(textFormat("a { b", "") == "a ");
938+
CAGE_TEST(textFormat("a } b", "") == "a } b");
939+
CAGE_TEST(textFormat("a {1} b", "huh") == "a b");
940+
CAGE_TEST(textFormat("a {-1} b", "huh") == "a b");
941+
CAGE_TEST(textFormat("a {0} b", "huh") == "a huh b");
942+
CAGE_TEST(textFormat("a {w} b", "huh") == "a b");
943+
CAGE_TEST(textFormat("a {} b", "huh") == "a b");
944+
CAGE_TEST(textFormat("a { } b", "huh") == "a b");
945+
CAGE_TEST(textFormat("a { b", "huh") == "a ");
946+
CAGE_TEST(textFormat("a } b", "huh") == "a } b");
947+
CAGE_TEST(textFormat("a {1} b", "|h") == "a h b");
948+
CAGE_TEST(textFormat("a {-1} b", "|h") == "a b");
949+
CAGE_TEST(textFormat("a {0} b", "|h") == "a b");
950+
CAGE_TEST(textFormat("a {w} b", "|h") == "a b");
951+
CAGE_TEST(textFormat("a {} b", "|h") == "a b");
952+
CAGE_TEST(textFormat("a { } b", "|h") == "a b");
953+
CAGE_TEST(textFormat("a { b", "|h") == "a ");
954+
CAGE_TEST(textFormat("a } b", "|h") == "a } b");
955+
CAGE_TEST(textFormat("a {1} b", "h|") == "a b");
956+
CAGE_TEST(textFormat("a {-1} b", "h|") == "a b");
957+
CAGE_TEST(textFormat("a {0} b", "h|") == "a h b");
958+
CAGE_TEST(textFormat("a {w} b", "h|") == "a b");
959+
CAGE_TEST(textFormat("a {} b", "h|") == "a b");
960+
CAGE_TEST(textFormat("a { } b", "h|") == "a b");
961+
CAGE_TEST(textFormat("a { b", "h|") == "a ");
962+
CAGE_TEST(textFormat("a } b", "h|") == "a } b");
963+
CAGE_TEST(textFormat("a{{}}b", "") == "a}b");
964+
CAGE_TEST(textFormat("a{}{}b", "") == "ab");
965+
CAGE_TEST(textFormat("a}{b", "") == "a}");
966+
CAGE_TEST(textFormat("a}{{b", "") == "a}");
967+
CAGE_TEST(textFormat("a}{}b", "") == "a}b");
931968
}
932969

933970
{

0 commit comments

Comments
 (0)