Remove empty lines before "}".

Those empty lines waste vertical whitespace and almost never
increase readability.

Before:
void f() {
  DoSomething();

}

After:
void f() {
  DoSomething();
}

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@173785 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 3 insertions, 0 deletions

diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 8eebda0740..58e6648ca3 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -1990,6 +1990,8 @@ private:
                                  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 63110bbfbe..ef242d7258 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -136,6 +136,7 @@ TEST_F(FormatTest, FormatsUnwrappedLinesAtFirstFormat) {
 
 TEST_F(FormatTest, FormatsNestedBlockStatements) {
   EXPECT_EQ("{\n  {\n    {}\n  }\n}", format("{{{}}}"));
+  EXPECT_EQ("{\n  {\n    {}\n  }\n}", format("{{{}}\n\n}"));
 }
 
 TEST_F(FormatTest, FormatsNestedCall) {