diff options
| author | Daniel Jasper <djasper@google.com> | 2013-01-29 10:00:16 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-01-29 10:00:16 +0000 |
| commit | 93384a910cb98f3a128b76e6043f149e1b384c65 (patch) | |
| tree | 4c82f17c205f3de1a1819c9f542d51e0c1c31af1 | |
| parent | 8df364fc0b3d89fb4ea632c6824a121a8c7752a5 (diff) | |
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
| -rw-r--r-- | lib/Format/Format.cpp | 2 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 1 |
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) { |