Coding style for inner namespaces is should be simplified to not indented

https://bugs.webkit.org/show_bug.cgi?id=232073

Patch by Kimmo Kinnunen <kkinnunen@apple.com> on 2021-11-10
Reviewed by Antti Koivisto.

.:

* .clang-format:
Do not indent contents of inner namespaces, match current code.

Websites/webkit.org:

* code-style.md:
Simplify coding style to match the existing code: contents of inner namespaces
should not be indented.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285601 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.clang-format b/.clang-format
index da2407cafda91390054ddc207d95bf97867d59cd..2dc3b36dbb6f6fb9db227e4da1d3c04993f15103 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -79,7 +79,7 @@ KeepEmptyLinesAtTheStartOfBlocks: true
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
-NamespaceIndentation: Inner
+NamespaceIndentation: None
 ObjCBlockIndentWidth: 4
 ObjCSpaceAfterProperty: true
 ObjCSpaceBeforeProtocolList: true

diff --git a/ChangeLog b/ChangeLog
index 3fa64181f3479d61d4b25df94b9725a324527a5e..be3e5c2bb734c376f8ab657efbd05927fcf09f28 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2021-11-10  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        Coding style for inner namespaces is should be simplified to not indented
+        https://bugs.webkit.org/show_bug.cgi?id=232073
+
+        Reviewed by Antti Koivisto.
+
+        * .clang-format:
+        Do not indent contents of inner namespaces, match current code.
+
 2021-11-09  J Pascoe  <j_pascoe@apple.com>
 
         Add j_pascoe to contributors.json

diff --git a/Websites/webkit.org/ChangeLog b/Websites/webkit.org/ChangeLog
index c25896d02898d3580062e255a5a19998e92e4041..e72774109274c7fa5f13bcc26c8d236f1ed00c80 100644 (file)
--- a/Websites/webkit.org/ChangeLog
+++ b/Websites/webkit.org/ChangeLog
@@ -1,3 +1,14 @@
+2021-11-10  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        Coding style for inner namespaces is should be simplified to not indented
+        https://bugs.webkit.org/show_bug.cgi?id=232073
+
+        Reviewed by Antti Koivisto.
+
+        * code-style.md:
+        Simplify coding style to match the existing code: contents of inner namespaces
+        should not be indented.
+
 2021-11-04  Ryan Haddad  <ryanhaddad@apple.com>
 
         Add Monterey to WebKit Build Archives page

diff --git a/Websites/webkit.org/code-style.md b/Websites/webkit.org/code-style.md
index 4e1404267ea2e85dafe2d0ce55bef0e3c913f7eb..c25352dec34fffe7ce626985ab9b5ffabc87e116 100644 (file)
--- a/Websites/webkit.org/code-style.md
+++ b/Websites/webkit.org/code-style.md
@@ -22,7 +22,7 @@ int main()
 }
 ```
 
-[](#indentation-namespace) The contents of an outermost `namespace` block (and any nested namespaces with the same scope) should not be indented. The contents of other nested namespaces should be indented.
+[](#indentation-namespace) The contents of namespaces should not be indented.
 
 ###### Right:
 
@@ -36,7 +36,12 @@ class Document {
 };
 
 namespace NestedNamespace {
+
+class OtherDocument {
+    OtherDocument();
     ...
+};
+
 }
 
 } // namespace WebCore
@@ -49,9 +54,31 @@ Document::Document()
     ...
 }
 
+namespace NestedNamespace {
+
+OtherDocument::OtherDocument()
+{
+    ...
+}
+
+} // namespace NestedNamespace
+
 } // namespace WebCore
 ```
 
+###### Right:
+
+```cpp
+// PrivateClickMeasurementDatabase.h
+namespace WebKit::PCM {
+
+class Database {
+    ...
+};
+
+} // namespace WebKit::PCM
+```
+
 ###### Wrong:
 
 ```cpp