Reverting changes from r173785 (removing empty lines before "}").
This needs some more thinking, e.g. for namespaces, chains of if-else
if, ...
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@173787 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 58e6648..8eebda0 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -1990,8 +1990,6 @@
Style.MaxEmptyLinesToKeep + 1);
if (Newlines == 0 && !Tok.IsFirst)
Newlines = 1;
- if (Tok.Tok.is(tok::r_brace) && Newlines > 1)
- Newlines = 1;
unsigned Indent = Level * 2;
bool IsAccessModifier = false;
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index ef242d7..63110bb 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -136,7 +136,6 @@
TEST_F(FormatTest, FormatsNestedBlockStatements) {
EXPECT_EQ("{\n {\n {}\n }\n}", format("{{{}}}"));
- EXPECT_EQ("{\n {\n {}\n }\n}", format("{{{}}\n\n}"));
}
TEST_F(FormatTest, FormatsNestedCall) {