Author: krasimir Date: Tue Mar 27 06:14:29 2018 New Revision: 328621 URL: http://llvm.org/viewvc/llvm-project?rev=328621&view=rev Log: Revert "[clang-format] Remove empty lines before }[;] // comment"
This reverts commit r327861. The empty line before namespaces is desired in some places. We need a better approach to handle this. Modified: cfe/trunk/lib/Format/UnwrappedLineFormatter.cpp cfe/trunk/unittests/Format/FormatTest.cpp Modified: cfe/trunk/lib/Format/UnwrappedLineFormatter.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/UnwrappedLineFormatter.cpp?rev=328621&r1=328620&r2=328621&view=diff ============================================================================== --- cfe/trunk/lib/Format/UnwrappedLineFormatter.cpp (original) +++ cfe/trunk/lib/Format/UnwrappedLineFormatter.cpp Tue Mar 27 06:14:29 2018 @@ -1133,12 +1133,8 @@ void UnwrappedLineFormatter::formatFirst std::min(RootToken.NewlinesBefore, Style.MaxEmptyLinesToKeep + 1); // Remove empty lines before "}" where applicable. if (RootToken.is(tok::r_brace) && - // Look for "}", "} // comment", "};" or "}; // comment". (!RootToken.Next || - (RootToken.Next->is(tok::comment) && !RootToken.Next->Next) || - (RootToken.Next->is(tok::semi) && - (!RootToken.Next->Next || (RootToken.Next->Next->is(tok::comment) && - !RootToken.Next->Next->Next))))) + (RootToken.Next->is(tok::semi) && !RootToken.Next->Next))) Newlines = std::min(Newlines, 1u); // Remove empty lines at the start of nested blocks (lambdas/arrow functions) if (PreviousLine == nullptr && Line.Level > 0) Modified: cfe/trunk/unittests/Format/FormatTest.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=328621&r1=328620&r2=328621&view=diff ============================================================================== --- cfe/trunk/unittests/Format/FormatTest.cpp (original) +++ cfe/trunk/unittests/Format/FormatTest.cpp Tue Mar 27 06:14:29 2018 @@ -276,6 +276,7 @@ TEST_F(FormatTest, RemovesEmptyLines) { "\n" "}")); + // FIXME: This is slightly inconsistent. FormatStyle LLVMWithNoNamespaceFix = getLLVMStyle(); LLVMWithNoNamespaceFix.FixNamespaceComments = false; EXPECT_EQ("namespace {\n" @@ -294,25 +295,12 @@ TEST_F(FormatTest, RemovesEmptyLines) { "}")); EXPECT_EQ("namespace {\n" "int i;\n" - "};", - format("namespace {\n" - "int i;\n" - "\n" - "};")); - EXPECT_EQ("namespace {\n" - "int i;\n" + "\n" "} // namespace", format("namespace {\n" "int i;\n" "\n" "} // namespace")); - EXPECT_EQ("namespace {\n" - "int i;\n" - "}; // namespace", - format("namespace {\n" - "int i;\n" - "\n" - "}; // namespace")); FormatStyle Style = getLLVMStyle(); Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_All; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits