<div dir="ltr">I am not yet sure whether we should move forward with removing blank lines in those cases at all. If we do, we should add decent testing, too.</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Jan 29, 2013 at 7:54 PM, Nico Weber <span dir="ltr"><<a href="mailto:thakis@chromium.org" target="_blank">thakis@chromium.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="im">On Tue, Jan 29, 2013 at 2:00 AM, Daniel Jasper <<a href="mailto:djasper@google.com">djasper@google.com</a>> wrote:<br>

> Author: djasper<br>
> Date: Tue Jan 29 04:00:16 2013<br>
> New Revision: 173787<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=173787&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=173787&view=rev</a><br>
> Log:<br>
> Reverting changes from r173785 (removing empty lines before "}").<br>
><br>
> This needs some more thinking, e.g. for namespaces, chains of if-else<br>
> if, ...<br>
<br>
</div>Do these have test cases yet? Should they?<br>
<div class="HOEnZb"><div class="h5"><br>
><br>
> Modified:<br>
>     cfe/trunk/lib/Format/Format.cpp<br>
>     cfe/trunk/unittests/Format/FormatTest.cpp<br>
><br>
> Modified: cfe/trunk/lib/Format/Format.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=173787&r1=173786&r2=173787&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=173787&r1=173786&r2=173787&view=diff</a><br>

> ==============================================================================<br>
> --- cfe/trunk/lib/Format/Format.cpp (original)<br>
> +++ cfe/trunk/lib/Format/Format.cpp Tue Jan 29 04:00:16 2013<br>
> @@ -1990,8 +1990,6 @@ private:<br>
>                                   Style.MaxEmptyLinesToKeep + 1);<br>
>      if (Newlines == 0 && !Tok.IsFirst)<br>
>        Newlines = 1;<br>
> -    if (<a href="http://Tok.Tok.is" target="_blank">Tok.Tok.is</a>(tok::r_brace) && Newlines > 1)<br>
> -      Newlines = 1;<br>
>      unsigned Indent = Level * 2;<br>
><br>
>      bool IsAccessModifier = false;<br>
><br>
> Modified: cfe/trunk/unittests/Format/FormatTest.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=173787&r1=173786&r2=173787&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=173787&r1=173786&r2=173787&view=diff</a><br>

> ==============================================================================<br>
> --- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
> +++ cfe/trunk/unittests/Format/FormatTest.cpp Tue Jan 29 04:00:16 2013<br>
> @@ -136,7 +136,6 @@ TEST_F(FormatTest, FormatsUnwrappedLines<br>
><br>
>  TEST_F(FormatTest, FormatsNestedBlockStatements) {<br>
>    EXPECT_EQ("{\n  {\n    {}\n  }\n}", format("{{{}}}"));<br>
> -  EXPECT_EQ("{\n  {\n    {}\n  }\n}", format("{{{}}\n\n}"));<br>
>  }<br>
><br>
>  TEST_F(FormatTest, FormatsNestedCall) {<br>
><br>
><br>
> _______________________________________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</div></div></blockquote></div><br></div>