This revision was automatically updated to reflect the committed changes. Closed by commit rG063c42e919c0: [clang-format] Handle NamespaceMacro string arg for FixNamespaceComments (authored by owenpan).
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D157568/new/ https://reviews.llvm.org/D157568 Files: clang/lib/Format/NamespaceEndCommentsFixer.cpp clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp
Index: clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp =================================================================== --- clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp +++ clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp @@ -40,6 +40,18 @@ Code, /*Ranges=*/{1, tooling::Range(0, Code.size())}, Style); } + + bool isFormatted(StringRef Code, const std::vector<tooling::Range> &Ranges, + const FormatStyle &Style = getLLVMStyle()) const { + return clang::format::fixNamespaceEndComments(Style, Code, Ranges, + "<stdin>") + .empty(); + } + + bool isFormatted(StringRef Code, + const FormatStyle &Style = getLLVMStyle()) const { + return isFormatted(Code, {1, tooling::Range(0, Code.size())}, Style); + } }; TEST_F(NamespaceEndCommentsFixerTest, AddsEndComment) { @@ -688,48 +700,34 @@ FormatStyle Style = getLLVMStyle(); Style.NamespaceMacros.push_back("TESTSUITE"); - EXPECT_EQ("TESTSUITE() {\n" - "int i;\n" - "} // end anonymous TESTSUITE()", - fixNamespaceEndComments("TESTSUITE() {\n" - "int i;\n" - "} // end anonymous TESTSUITE()", - Style)); - EXPECT_EQ("TESTSUITE(A) {\n" - "int i;\n" - "} /* end of TESTSUITE(A) */", - fixNamespaceEndComments("TESTSUITE(A) {\n" - "int i;\n" - "} /* end of TESTSUITE(A) */", - Style)); - EXPECT_EQ("TESTSUITE(A) {\n" - "int i;\n" - "} // TESTSUITE(A)", - fixNamespaceEndComments("TESTSUITE(A) {\n" - "int i;\n" - "} // TESTSUITE(A)", - Style)); - EXPECT_EQ("TESTSUITE(A::B) {\n" - "int i;\n" - "} // end TESTSUITE(A::B)", - fixNamespaceEndComments("TESTSUITE(A::B) {\n" - "int i;\n" - "} // end TESTSUITE(A::B)", - Style)); - EXPECT_EQ("TESTSUITE(A) {\n" - "int i;\n" - "}; // end TESTSUITE(A)", - fixNamespaceEndComments("TESTSUITE(A) {\n" - "int i;\n" - "}; // end TESTSUITE(A)", - Style)); - EXPECT_EQ("TESTSUITE() {\n" - "int i;\n" - "}; /* unnamed TESTSUITE() */", - fixNamespaceEndComments("TESTSUITE() {\n" - "int i;\n" - "}; /* unnamed TESTSUITE() */", - Style)); + EXPECT_TRUE(isFormatted("TESTSUITE() {\n" + "int i;\n" + "} // end anonymous TESTSUITE()", + Style)); + EXPECT_TRUE(isFormatted("TESTSUITE(A) {\n" + "int i;\n" + "} /* end of TESTSUITE(A) */", + Style)); + EXPECT_TRUE(isFormatted("TESTSUITE(A) {\n" + "int i;\n" + "} // TESTSUITE(A)", + Style)); + EXPECT_TRUE(isFormatted("TESTSUITE(A::B) {\n" + "int i;\n" + "} // end TESTSUITE(A::B)", + Style)); + EXPECT_TRUE(isFormatted("TESTSUITE(A) {\n" + "int i;\n" + "}; // end TESTSUITE(A)", + Style)); + EXPECT_TRUE(isFormatted("TESTSUITE() {\n" + "int i;\n" + "}; /* unnamed TESTSUITE() */", + Style)); + EXPECT_TRUE(isFormatted("TESTSUITE(\"foo\") {\n" + "int i;\n" + "} // TESTSUITE(\"foo\")", + Style)); } TEST_F(NamespaceEndCommentsFixerTest, UpdatesInvalidEndLineComment) { Index: clang/lib/Format/NamespaceEndCommentsFixer.cpp =================================================================== --- clang/lib/Format/NamespaceEndCommentsFixer.cpp +++ clang/lib/Format/NamespaceEndCommentsFixer.cpp @@ -174,7 +174,7 @@ llvm::Regex::IgnoreCase); static const llvm::Regex NamespaceMacroCommentPattern = llvm::Regex("^/[/*] *(end (of )?)? *(anonymous|unnamed)? *" - "([a-zA-Z0-9_]+)\\(([a-zA-Z0-9:_]*)\\)\\.? *(\\*/)?$", + "([a-zA-Z0-9_]+)\\(([a-zA-Z0-9:_]*|\".+\")\\)\\.? *(\\*/)?$", llvm::Regex::IgnoreCase); SmallVector<StringRef, 8> Groups;
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits