Remove reduntant tests and simplify code

Author: dmasloff

clang/lib/Format/UnwrappedLineFormatter.cpp

@@ -32,26 +32,6 @@ bool isRecordLBrace(const FormatToken &Tok) {
                      TT_StructLBrace, TT_UnionLBrace);
 }
 
-bool LineStartsNamespaceScope(const AnnotatedLine *Line,
-                              const AnnotatedLine *PreviousLine,
-                              const AnnotatedLine *PrevPrevLine) {
-  return PreviousLine &&
-         ((PreviousLine->Last->is(tok::l_brace) &&
-           PreviousLine->startsWithNamespace()) ||
-          (PrevPrevLine && PrevPrevLine->startsWithNamespace() &&
-           PreviousLine->startsWith(tok::l_brace)));
-}
-
-bool LineEndsNamespaceScope(const AnnotatedLine *Line,
-                            const SmallVectorImpl<AnnotatedLine *> &Lines) {
-  if (!Line)
-    return false;
-  const FormatToken *Tok = Line->First;
-  if (!Tok || Tok->isNot(tok::r_brace))
-    return false;
-  return getNamespaceToken(Line, Lines) != nullptr;
-}
-
 /// Tracks the indent level of \c AnnotatedLines across levels.
 ///
 /// \c nextLine must be called for each \c AnnotatedLine, after which \c
@@ -1604,27 +1584,21 @@ static auto computeNewlines(const AnnotatedLine &Line,
     Newlines = 1;
   }
 
-  // Modify empty lines after "{" that opens namespace scope.
-  if (Style.WrapNamespaceBodyWithEmptyLines != FormatStyle::WNBWELS_Leave &&
-      LineStartsNamespaceScope(&Line, PreviousLine, PrevPrevLine)) {
-    if (Style.WrapNamespaceBodyWithEmptyLines == FormatStyle::WNBWELS_Never)
-      Newlines = std::min(Newlines, 1u);
-    else if (!Line.startsWithNamespace())
-      Newlines = std::max(Newlines, 2u);
-    else
-      Newlines = std::min(Newlines, 1u);
-  }
-
-  // Modify empty lines before "}" that closes namespace scope.
-  if (Style.WrapNamespaceBodyWithEmptyLines != FormatStyle::WNBWELS_Leave &&
-      LineEndsNamespaceScope(&Line, Lines)) {
-    if (Style.WrapNamespaceBodyWithEmptyLines == FormatStyle::WNBWELS_Never)
-      Newlines = std::min(Newlines, 1u);
-    else if (!LineEndsNamespaceScope(PreviousLine, Lines))
-      Newlines = std::max(Newlines, 2u);
-    else
-      Newlines = std::min(Newlines, 1u);
-  }
+  if (Style.WrapNamespaceBodyWithEmptyLines != FormatStyle::WNBWELS_Leave) {
+    // Modify empty lines after TT_NamespaceLBrace.
+    if (PreviousLine && PreviousLine->endsWith(TT_NamespaceLBrace)) {
+      if (Style.WrapNamespaceBodyWithEmptyLines == FormatStyle::WNBWELS_Never)
+        Newlines = 1;
+      else if (!Line.startsWithNamespace())
+        Newlines = std::max(Newlines, 2u);
+    }
+    // Modify empty lines before TT_NamespaceRBrace.
+    if (Line.startsWith(TT_NamespaceRBrace)) {
+      if (Style.WrapNamespaceBodyWithEmptyLines == FormatStyle::WNBWELS_Never)
+        Newlines = 1;
+      else if (!PreviousLine->startsWith(TT_NamespaceRBrace))
+        Newlines = std::max(Newlines, 2u);
+    }
 
   // Insert or remove empty line before access specifiers.
   if (PreviousLine && RootToken.isAccessSpecifier()) {

clang/unittests/Format/FormatTest.cpp

@@ -28430,6 +28430,7 @@ TEST_F(FormatTest, ShortNamespacesOption) {
 TEST_F(FormatTest, WrapNamespaceBodyWithEmptyLinesNever) {
   auto Style = getLLVMStyle();
   Style.FixNamespaceComments = false;
+  Style.WrapNamespaceBodyWithEmptyLines = FormatStyle::WNBWELS_Never;
 
   // Empty namespace.
   verifyFormat("namespace N {}", Style);
@@ -28511,21 +28512,6 @@ TEST_F(FormatTest, WrapNamespaceBodyWithEmptyLinesAlways) {
                "}",
                Style);
 
-  // Removing empty lines.
-  verifyFormat("namespace N {\n"
-               "\n"
-               "int a = 1;\n"
-               "\n"
-               "}",
-               "namespace N {"
-               "\n"
-               "\n"
-               "int a = 1;\n"
-               "\n"
-               "\n"
-               "}",
-               Style);
-
   Style.CompactNamespaces = true;
 
   // Nested namespace.
@@ -28550,9 +28536,6 @@ TEST_F(FormatTest, WrapNamespaceBodyWithEmptyLinesAlways) {
 
   Style.CompactNamespaces = false;
 
-  // Empty namespace.
-  verifyFormat("namespace N {}", Style);
-
   // Single namespace.
   verifyNoChange("namespace N {\n"
                  "\n"
@@ -28576,93 +28559,6 @@ TEST_F(FormatTest, WrapNamespaceBodyWithEmptyLinesAlways) {
                  Style);
 }
 
-TEST_F(FormatTest, WrapNamespaceBodyWithEmptyLinesLeave) {
-  auto Style = getLLVMStyle();
-  Style.FixNamespaceComments = false;
-
-  // Empty namespace.
-  verifyFormat("namespace N {}", Style);
-
-  // Single namespace.
-  verifyFormat("namespace N {\n"
-               "int f1(int a) { return 2 * a; }\n"
-               "}",
-               Style);
-
-  // Nested namespace.
-  verifyFormat("namespace N1 {\n"
-               "namespace N2 {\n"
-               "int a = 1;\n"
-               "}\n"
-               "}",
-               Style);
-
-  // Removing empty lines.
-  verifyFormat("namespace N {\n"
-               "\n"
-               "int a = 1;\n"
-               "\n"
-               "}",
-               "namespace N {\n"
-               "\n"
-               "\n"
-               "int a = 1;\n"
-               "\n"
-               "\n"
-               "}",
-               Style);
-
-  Style.MaxEmptyLinesToKeep = 0;
-
-  verifyFormat("namespace N {\n"
-               "int a = 1;\n"
-               "}",
-               "namespace N {\n"
-               "\n"
-               "\n"
-               "int a = 1;\n"
-               "\n"
-               "\n"
-               "}",
-               Style);
-
-  Style.MaxEmptyLinesToKeep = 2;
-
-  // Single namespace.
-  verifyNoChange("namespace N {\n"
-                 "\n"
-                 "\n"
-                 "int f1(int a) { return 2 * a; }\n"
-                 "\n"
-                 "\n"
-                 "}",
-                 Style);
-
-  // Nested namespace.
-  verifyNoChange("namespace N1 {\n"
-                 "namespace N2 {\n"
-                 "\n"
-                 "\n"
-                 "int a = 1;\n"
-                 "\n"
-                 "\n"
-                 "}\n"
-                 "}",
-                 Style);
-
-  Style.CompactNamespaces = true;
-
-  // Nested namespace.
-  verifyNoChange("namespace N1 { namespace N2 {\n"
-                 "\n"
-                 "\n"
-                 "int a = 1;\n"
-                 "\n"
-                 "\n"
-                 "}}",
-                 Style);
-}
-
 } // namespace
 } // namespace test
 } // namespace format