From 93384a910cb98f3a128b76e6043f149e1b384c65 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Tue, 29 Jan 2013 10:00:16 +0000 Subject: [PATCH] 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 --- lib/Format/Format.cpp | 2 -- unittests/Format/FormatTest.cpp | 1 - 2 files changed, 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) { -- 2.50.1