[clang-format] Insert namespace comments with leading spaces

[owenpan]

Summary

Insert missing namespace comments with SpacesBeforeTrailingComments leading spaces.

Fixes https://github.com/llvm/llvm-project/issues/64051.

[HazardyKnusperkeks]

clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp

29

I'd rather fix all the tests.

[owenpan]

Fixed unit tests in NamespaceEndCommentsFixerTest.cpp.

clang/lib/Format/NamespaceEndCommentsFixer.cpp

for (size_t I = 0, E = AnnotatedLines.size(); I != E; ++I) {
     bool AddNewline = EndCommentNextTok &&
                       EndCommentNextTok->NewlinesBefore == 0 &&
                       EndCommentNextTok->isNot(tok::eof);
     const std::string EndCommentText =
         computeEndCommentText(NamespaceName, AddNewline, NamespaceTok,
                               Style.SpacesInLineCommentPrefix.Minimum);
     if (!hasEndComment(EndCommentPrevTok)) {
       bool isShort = I - StartLineIndex <= Style.ShortNamespaceLines + 1;
-      if (!isShort)
-        addEndComment(EndCommentPrevTok, EndCommentText, SourceMgr, &Fixes);
+      if (!isShort) {
+        addEndComment(EndCommentPrevTok,
+                      std::string(Style.SpacesBeforeTrailingComments, ' ') +
+                          EndCommentText,
+                      SourceMgr, &Fixes);
+      }
     } else if (!validEndComment(EndCommentPrevTok, NamespaceName,
                                 NamespaceTok)) {
       updateEndComment(EndCommentPrevTok, EndCommentText, SourceMgr, &Fixes);
     }
     StartLineIndex = SIZE_MAX;
   }
   return {Fixes, 0};
 }
 
 } // namespace format
 } // namespace clang

clang/unittests/Format/FormatTestComments.cpp

EXPECT_EQ("// do not touch\n"
                    "\n"
                    "   // comment\n"
                    "// comment\n"
                    "\n"
                    "\n"
                    "// comment",
                    Style));
 
+  verifyFormat("namespace ns {\n"
+               "int i;\n"
+               "int j;\n"
+               "} // namespace ns",
+               "namespace ns {\n"
+               "int i;\n"
+               "int j;\n"
+               "}",
+               Style);
+
   // Allow to keep 2 empty lines
   Style.MaxEmptyLinesToKeep = 2;
   EXPECT_EQ("// do not touch\n"
             "int a;  // any comments\n"
             "\n"
             "\n"
             "   // comment\n"
             "// comment\n"

clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp

 class NamespaceEndCommentsFixerTest : public ::testing::Test {
 protected:
   std::string
   fixNamespaceEndComments(llvm::StringRef Code,
                           const std::vector<tooling::Range> &Ranges,
                           const FormatStyle &Style = getLLVMStyle()) {
     LLVM_DEBUG(llvm::errs() << "---\n");
     LLVM_DEBUG(llvm::errs() << Code << "\n\n");
+    FormatStyle S = Style;
+    S.SpacesBeforeTrailingComments = 0;
     tooling::Replacements Replaces =
-        clang::format::fixNamespaceEndComments(Style, Code, Ranges, "<stdin>");
+        clang::format::fixNamespaceEndComments(S, Code, Ranges, "<stdin>");
     auto Result = applyAllReplacements(Code, Replaces);
     EXPECT_TRUE(static_cast<bool>(Result));
     LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n");
     return *Result;
   }
 
   std::string
   fixNamespaceEndComments(llvm::StringRef Code,