RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:37:35 +00:00
Code Issues Activity Actions

AK: Add String::join

Browse source
This commit is contained in:
Timothy Flynn 2023-01-27 14:06:05 -05:00 • committed by Linus Groh
parent 79aaa2fe0f
commit cccaa94767
3 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
AK/String.cpp
View file

@ -10,7 +10,6 @@
#include <AK/Format.h> #include <AK/Format.h>
#include <AK/MemMem.h> #include <AK/MemMem.h>
#include <AK/String.h> #include <AK/String.h>
#include <AK/StringBuilder.h>
#include <AK/Utf8View.h> #include <AK/Utf8View.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <stdlib.h> #include <stdlib.h>

9
AK/String.h
View file

@ -14,6 +14,7 @@
#include <AK/Optional.h> #include <AK/Optional.h>
#include <AK/RefCounted.h> #include <AK/RefCounted.h>
#include <AK/Span.h> #include <AK/Span.h>
#include <AK/StringBuilder.h>
#include <AK/StringUtils.h> #include <AK/StringUtils.h>
#include <AK/StringView.h> #include <AK/StringView.h>
#include <AK/Traits.h> #include <AK/Traits.h>
@ -185,6 +186,14 @@ public:
return vformatted(fmtstr.view(), variadic_format_parameters); return vformatted(fmtstr.view(), variadic_format_parameters);
} }
template<class SeparatorType, class CollectionType>
static ErrorOr<String> join(SeparatorType const& separator, CollectionType const& collection, StringView fmtstr = "{}"sv)
{
StringBuilder builder;
TRY(builder.try_join(separator, collection, fmtstr));
return builder.to_string();
}
// NOTE: This is primarily interesting to unit tests. // NOTE: This is primarily interesting to unit tests.
[[nodiscard]] bool is_short_string() const; [[nodiscard]] bool is_short_string() const;

24
Tests/AK/TestString.cpp
View file

@ -471,3 +471,27 @@ TEST_CASE(repeated)
return Test::Crash::Failure::DidNotCrash; return Test::Crash::Failure::DidNotCrash;
}); });
} }
TEST_CASE(join)
{
auto string1 = MUST(String::join(',', Vector<i32> {}));
EXPECT(string1.is_empty());
auto string2 = MUST(String::join(',', Array { 1 }));
EXPECT_EQ(string2, "1"sv);
auto string3 = MUST(String::join(':', Array { 1 }, "[{}]"sv));
EXPECT_EQ(string3, "[1]"sv);
auto string4 = MUST(String::join(',', Array { 1, 2, 3 }));
EXPECT_EQ(string4, "1,2,3"sv);
auto string5 = MUST(String::join(',', Array { 1, 2, 3 }, "[{}]"sv));
EXPECT_EQ(string5, "[1],[2],[3]"sv);
auto string6 = MUST(String::join(String::from_utf8_short_string("!!!"sv), Array { "foo"sv, "bar"sv, "baz"sv }));
EXPECT_EQ(string6, "foo!!!bar!!!baz"sv);
auto string7 = MUST(String::join(" - "sv, Array { 1, 16, 256, 4096 }, "[{:#04x}]"sv));
EXPECT_EQ(string7, "[0x0001] - [0x0010] - [0x0100] - [0x1000]"sv);
}