By popular request, put comments on closing } when we add new

namespaces.

R=wan
DELTA=15  (0 added, 0 deleted, 15 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=1559

fix_includes.py

@@ -1656,11 +1656,11 @@ def _NormalizeNamespaceForwardDeclareLines(lines):
      namespace bar {
      class A;
      class B;
-     }
+     }  // namespace bar
      namespace bang {
      class C;
-     }
-     }
+     }  // namespace bang
+     }  // namespace foo
 
   Non-namespace lines are left alone.  Only adjacent namespace lines
   from the input are merged.
@@ -1682,9 +1682,9 @@ def _NormalizeNamespaceForwardDeclareLines(lines):
   for line in lines + ['']:
     namespaces_in_line = iwyu_namespace_re.findall(line)
     differ_pos = _CommonPrefixLength(namespaces_in_line, current_namespaces)
-    namespaces_to_close = current_namespaces[differ_pos:]
+    namespaces_to_close = reversed(current_namespaces[differ_pos:])
     namespaces_to_open = namespaces_in_line[differ_pos:]
-    retval.extend(['}'] * len(namespaces_to_close))
+    retval.extend('}  // namespace %s' % ns for ns in namespaces_to_close)
     retval.extend('namespace %s {' % ns for ns in namespaces_to_open)
     current_namespaces = namespaces_in_line
     # Now add the current line.  If we were a namespace line, it's the

fix_includes_test.py

@@ -719,14 +719,14 @@ template<typename T> class Nest::NestedTplClass;  // lines 11-11
 
 ///+namespace Bar {
 ///+class Baz;
-///+}
+///+}  // namespace Bar
 ///+
 using Bar::baz;
 
 namespace Foo { class Bang; }  ///-
 ///+namespace Foo {
 ///+class Bang;
-///+}
+///+}  // namespace Foo
 
 int main() { return 0; }
 """
@@ -758,12 +758,12 @@ namespace Foo { class Bang; }  // lines 7-7
 ///+namespace ns3 {
 ///+class Bar;
 ///+template <typename T> class Bang;
-///+}
-///+}
+///+}  // namespace ns3
+///+}  // namespace ns2
 ///+namespace ns4 {
 ///+class Baz;
-///+}
-///+}
+///+}  // namespace ns4
+///+}  // namespace ns
 ///+
 
 int main() { return 0; }
@@ -806,7 +806,7 @@ class NsFoo;
 ///+namespace ns3 {
 ///+class NsBang;
 ///+template <typename T> class NsBaz;
-///+}
+///+}  // namespace ns3
 template <typename T> class NsBar;
 
 }
@@ -846,8 +846,8 @@ class Bar;
 ///+namespace ns2 {
 ///+class NsBang;
 ///+template <typename T> class NsBaz;
-///+}
-///+}
+///+}  // namespace ns2
+///+}  // namespace ns
 template <typename T> class Baz;
 
 #ifdef THIS_IS_A_CONTENTFUL_LINE
@@ -2533,7 +2533,7 @@ The full include-list for barrier_includes.h:
 class Query;
 ///+namespace util {
 ///+class Status;
-///+}
+///+}  // namespace util
 
 namespace structuredsearch {