LibWeb: Rename StyleRules.cpp -> StyleRule.cpp and tidy up

`append_with_to_string()` is no longer needed now that ComponentValue
has a Formatter.

3 files changed, 39 insertions, 56 deletions

diff --git a/Userland/Libraries/LibWeb/CMakeLists.txt b/Userland/Libraries/LibWeb/CMakeLists.txt
index 13cc6987db..dd0ed73a0b 100644
--- a/Userland/Libraries/LibWeb/CMakeLists.txt
+++ b/Userland/Libraries/LibWeb/CMakeLists.txt
@@ -50,7 +50,7 @@ set(SOURCES
     CSS/Parser/DeclarationOrAtRule.cpp
     CSS/Parser/Function.cpp
     CSS/Parser/Parser.cpp
-    CSS/Parser/StyleRules.cpp
+    CSS/Parser/StyleRule.cpp
     CSS/Parser/Token.cpp
     CSS/Parser/Tokenizer.cpp
     CSS/Percentage.cpp
diff --git a/Userland/Libraries/LibWeb/CSS/Parser/StyleRule.cpp b/Userland/Libraries/LibWeb/CSS/Parser/StyleRule.cpp
new file mode 100644
index 0000000000..177e4e1648
--- /dev/null
+++ b/Userland/Libraries/LibWeb/CSS/Parser/StyleRule.cpp
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2020-2021, the SerenityOS developers.
+ * Copyright (c) 2021-2022, Sam Atkins <atkinssj@serenityos.org>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#include <LibWeb/CSS/Parser/StyleRule.h>
+#include <LibWeb/CSS/Serialize.h>
+
+namespace Web::CSS {
+
+StyleRule::StyleRule(StyleRule::Type type)
+    : m_type(type)
+{
+}
+StyleRule::~StyleRule() = default;
+
+String StyleRule::to_string() const
+{
+    StringBuilder builder;
+
+    if (is_at_rule()) {
+        builder.append("@");
+        serialize_an_identifier(builder, m_at_rule_name);
+    }
+
+    builder.join(" ", m_prelude);
+
+    if (m_block)
+        builder.append(m_block->to_string());
+    else
+        builder.append(';');
+
+    return builder.to_string();
+}
+
+}
diff --git a/Userland/Libraries/LibWeb/CSS/Parser/StyleRules.cpp b/Userland/Libraries/LibWeb/CSS/Parser/StyleRules.cpp
deleted file mode 100644
index ca71929a75..0000000000
--- a/Userland/Libraries/LibWeb/CSS/Parser/StyleRules.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2020-2021, the SerenityOS developers.
- * Copyright (c) 2021, Sam Atkins <atkinssj@serenityos.org>
- *
- * SPDX-License-Identifier: BSD-2-Clause
- */
-
-#include <LibWeb/CSS/Parser/Block.h>
-#include <LibWeb/CSS/Parser/ComponentValue.h>
-#include <LibWeb/CSS/Parser/Declaration.h>
-#include <LibWeb/CSS/Parser/DeclarationOrAtRule.h>
-#include <LibWeb/CSS/Parser/Function.h>
-#include <LibWeb/CSS/Parser/StyleRule.h>
-#include <LibWeb/CSS/Serialize.h>
-
-namespace Web::CSS {
-
-StyleRule::StyleRule(StyleRule::Type type)
-    : m_type(type)
-{
-}
-StyleRule::~StyleRule() = default;
-
-template<class SeparatorType, class CollectionType>
-void append_with_to_string(StringBuilder& builder, SeparatorType& separator, CollectionType& collection)
-{
-    bool first = true;
-    for (auto& item : collection) {
-        if (first)
-            first = false;
-        else
-            builder.append(separator);
-        builder.append(item.to_string());
-    }
-}
-
-String StyleRule::to_string() const
-{
-    StringBuilder builder;
-
-    if (is_at_rule()) {
-        builder.append("@");
-        serialize_an_identifier(builder, m_at_rule_name);
-    }
-
-    append_with_to_string(builder, " ", m_prelude);
-
-    if (m_block)
-        builder.append(m_block->to_string());
-    else
-        builder.append(';');
-
-    return builder.to_string();
-}
-}