aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Format/Format.cpp2
-rw-r--r--unittests/Format/FormatTest.cpp1
2 files changed, 0 insertions, 3 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 58e6648ca3..8eebda0740 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -1990,8 +1990,6 @@ 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 ef242d7258..63110bbfbe 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -136,7 +136,6 @@ 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) {