[clang-format] Remove empty lines before }[;] // comment
Summary:
This addresses bug 36766 and a FIXME in tests about empty lines before
`}[;] // comment` lines.
Subscribers: klimek, cfe-commits
Differential Revision: https://reviews.llvm.org/D44631
llvm-svn: 327861
diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
index a9fbe4b..bdb3fbe 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -276,7 +276,6 @@
"\n"
"}"));
- // FIXME: This is slightly inconsistent.
FormatStyle LLVMWithNoNamespaceFix = getLLVMStyle();
LLVMWithNoNamespaceFix.FixNamespaceComments = false;
EXPECT_EQ("namespace {\n"
@@ -295,12 +294,25 @@
"}"));
EXPECT_EQ("namespace {\n"
"int i;\n"
- "\n"
+ "};",
+ format("namespace {\n"
+ "int i;\n"
+ "\n"
+ "};"));
+ EXPECT_EQ("namespace {\n"
+ "int i;\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;