From efaf03e986337e096e16e1aee938ddc9f8df97f4 Mon Sep 17 00:00:00 2001
From: Luke <luke.wilde@live.co.uk>
Date: Sat, 10 Oct 2020 02:43:48 +0100
Subject: [PATCH] LibWeb: Use modern namespaces and fix clang-format comments
 in tag names

---
 Libraries/LibWeb/DOM/TagNames.cpp | 8 ++------
 Libraries/LibWeb/DOM/TagNames.h   | 6 +-----
 Libraries/LibWeb/SVG/TagNames.cpp | 2 +-
 Libraries/LibWeb/SVG/TagNames.h   | 4 ++--
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/Libraries/LibWeb/DOM/TagNames.cpp b/Libraries/LibWeb/DOM/TagNames.cpp
index 13ecc52147..b1d6558d79 100644
--- a/Libraries/LibWeb/DOM/TagNames.cpp
+++ b/Libraries/LibWeb/DOM/TagNames.cpp
@@ -26,9 +26,7 @@
 
 #include <LibWeb/DOM/TagNames.h>
 
-namespace Web {
-namespace HTML {
-namespace TagNames {
+namespace Web::HTML::TagNames {
 
 #define __ENUMERATE_HTML_TAG(name) FlyString name;
 ENUMERATE_HTML_TAGS
@@ -37,7 +35,7 @@ ENUMERATE_HTML_TAGS
     // clang-format off
 // FIXME: clang-format gets confused here. Why?
 [[gnu::constructor]] static void initialize()
-// clang-format off
+// clang-format on
 {
     static bool s_initialized = false;
     if (s_initialized)
@@ -54,5 +52,3 @@ ENUMERATE_HTML_TAGS
 }
 
 }
-}
-}
diff --git a/Libraries/LibWeb/DOM/TagNames.h b/Libraries/LibWeb/DOM/TagNames.h
index 2d58060e99..9d7f924e2a 100644
--- a/Libraries/LibWeb/DOM/TagNames.h
+++ b/Libraries/LibWeb/DOM/TagNames.h
@@ -28,9 +28,7 @@
 
 #include <AK/FlyString.h>
 
-namespace Web {
-namespace HTML {
-namespace TagNames {
+namespace Web::HTML::TagNames {
 
 #define ENUMERATE_HTML_TAGS          \
     __ENUMERATE_HTML_TAG(a)          \
@@ -178,5 +176,3 @@ ENUMERATE_HTML_TAGS
 #undef __ENUMERATE_HTML_TAG
 
 }
-}
-}
diff --git a/Libraries/LibWeb/SVG/TagNames.cpp b/Libraries/LibWeb/SVG/TagNames.cpp
index 00577803ee..3357841225 100644
--- a/Libraries/LibWeb/SVG/TagNames.cpp
+++ b/Libraries/LibWeb/SVG/TagNames.cpp
@@ -35,7 +35,7 @@ ENUMERATE_SVG_TAGS
     // clang-format off
 // FIXME: clang-format gets confused here. Why?
 [[gnu::constructor]] static void initialize()
-// clang-format off
+// clang-format on
 {
     static bool s_initialized = false;
     if (s_initialized)
diff --git a/Libraries/LibWeb/SVG/TagNames.h b/Libraries/LibWeb/SVG/TagNames.h
index 682d678a4e..4cd0764cc9 100644
--- a/Libraries/LibWeb/SVG/TagNames.h
+++ b/Libraries/LibWeb/SVG/TagNames.h
@@ -31,8 +31,8 @@
 namespace Web::SVG::TagNames {
 
 #define ENUMERATE_SVG_GRAPHICS_TAGS \
-    __ENUMERATE_SVG_TAG(svg)        \
-    __ENUMERATE_SVG_TAG(path)
+    __ENUMERATE_SVG_TAG(path)       \
+    __ENUMERATE_SVG_TAG(svg)
 
 #define ENUMERATE_SVG_TAGS \
     ENUMERATE_SVG_GRAPHICS_TAGS