mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-11-22 07:30:19 +00:00
AK: Replace String::trim_spaces() with String::trim_whitespace()
As suggested by @awesomekling in a code review and (initially) ignored by me :^) Implementation is roughly based on LibJS's trim_string(), but with a fix for trimming all-whitespace strings.
This commit is contained in:
parent
0c14ee035c
commit
1febee768d
Notes:
sideshowbarker
2024-07-19 06:41:10 +09:00
Author: https://github.com/linusg Commit: https://github.com/SerenityOS/serenity/commit/1febee768d2 Pull-request: https://github.com/SerenityOS/serenity/pull/2208
3 changed files with 41 additions and 12 deletions
|
@ -369,18 +369,42 @@ int String::replace(const String& needle, const String& replacement, bool all_oc
|
|||
return positions.size();
|
||||
}
|
||||
|
||||
String String::trim_spaces() const
|
||||
String String::trim_whitespace(TrimMode mode) const
|
||||
{
|
||||
size_t start = 0;
|
||||
size_t end = length();
|
||||
while (characters()[start] == ' ')
|
||||
++start;
|
||||
while (characters()[end] == ' ') {
|
||||
if (end <= start)
|
||||
return "";
|
||||
--end;
|
||||
auto is_whitespace_character = [](char ch) -> bool {
|
||||
return ch == '\t'
|
||||
|| ch == '\n'
|
||||
|| ch == '\v'
|
||||
|| ch == '\f'
|
||||
|| ch == '\r'
|
||||
|| ch == ' ';
|
||||
};
|
||||
|
||||
size_t substring_start = 0;
|
||||
size_t substring_length = length();
|
||||
|
||||
if (mode == TrimMode::Left || mode == TrimMode::Both) {
|
||||
for (size_t i = 0; i < length(); ++i) {
|
||||
if (substring_length == 0)
|
||||
return "";
|
||||
if (!is_whitespace_character(characters()[i]))
|
||||
break;
|
||||
++substring_start;
|
||||
--substring_length;
|
||||
}
|
||||
}
|
||||
return substring(start, end - start);
|
||||
|
||||
if (mode == TrimMode::Right || mode == TrimMode::Both) {
|
||||
for (size_t i = length() - 1; i > 0; --i) {
|
||||
if (substring_length == 0)
|
||||
return "";
|
||||
if (!is_whitespace_character(characters()[i]))
|
||||
break;
|
||||
--substring_length;
|
||||
}
|
||||
}
|
||||
|
||||
return substring(substring_start, substring_length);
|
||||
}
|
||||
|
||||
String escape_html_entities(const StringView& html)
|
||||
|
|
|
@ -114,7 +114,12 @@ public:
|
|||
String to_lowercase() const;
|
||||
String to_uppercase() const;
|
||||
|
||||
String trim_spaces() const;
|
||||
enum class TrimMode {
|
||||
Left,
|
||||
Right,
|
||||
Both
|
||||
};
|
||||
String trim_whitespace(TrimMode mode = TrimMode::Both) const;
|
||||
|
||||
bool equals_ignoring_case(const StringView&) const;
|
||||
|
||||
|
|
|
@ -144,7 +144,7 @@ void StyleProperties::load_font() const
|
|||
|
||||
// FIXME: Do this properly, with quote handling etc.
|
||||
for (auto& font_name : font_family.split(',')) {
|
||||
font_name = font_name.trim_spaces();
|
||||
font_name = font_name.trim_whitespace();
|
||||
if (font_name == "monospace")
|
||||
font_name = "Csilla";
|
||||
|
||||
|
|
Loading…
Reference in a new issue