<div dir="ltr">Sure. Done in r182024.</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, May 16, 2013 at 6:42 PM, Jordan Rose <span dir="ltr"><<a href="mailto:jordan_rose@apple.com" target="_blank">jordan_rose@apple.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Can you add a test to make sure we don't turn this:<br>
<br>
void longFunctionName {<br>
} // long comment here<br>
<br>
into this:<br>
<br>
void longFunctionName {}<br>
// long comment here<br>
<br>
?<br>
<div class="HOEnZb"><div class="h5"><br>
<br>
On May 16, 2013, at 3:17 , Daniel Jasper <<a href="mailto:djasper@google.com">djasper@google.com</a>> wrote:<br>
<br>
> Author: djasper<br>
> Date: Thu May 16 05:17:39 2013<br>
> New Revision: 181996<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=181996&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=181996&view=rev</a><br>
> Log:<br>
> Comments should not prevent single-line functions.<br>
><br>
> Before:<br>
> void f() {}<br>
> void g() {<br>
> } // comment<br>
><br>
> After:<br>
> void f() {}<br>
> void g() {} // comment<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=181996&r1=181995&r2=181996&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=181996&r1=181995&r2=181996&view=diff</a><br>

> ==============================================================================<br>
> --- cfe/trunk/lib/Format/Format.cpp (original)<br>
> +++ cfe/trunk/lib/Format/Format.cpp Thu May 16 05:17:39 2013<br>
> @@ -1418,7 +1418,7 @@ private:<br>
>       return;<br>
><br>
>     AnnotatedToken *Tok = &(I + 1)->First;<br>
> -    if (Tok->Children.empty() && Tok->is(tok::r_brace) &&<br>
> +    if (Tok->getNextNoneComment() == NULL && Tok->is(tok::r_brace) &&<br>
>         !Tok->MustBreakBefore) {<br>
>       // We merge empty blocks even if the line exceeds the column limit.<br>
>       Tok->SpacesRequiredBefore = 0;<br>
> @@ -1443,7 +1443,7 @@ private:<br>
><br>
>       // Last, check that the third line contains a single closing brace.<br>
>       Tok = &(I + 2)->First;<br>
> -      if (!Tok->Children.empty() || Tok->isNot(tok::r_brace) ||<br>
> +      if (Tok->getNextNoneComment() != NULL || Tok->isNot(tok::r_brace) ||<br>
>           Tok->MustBreakBefore)<br>
>         return;<br>
><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=181996&r1=181995&r2=181996&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=181996&r1=181995&r2=181996&view=diff</a><br>

> ==============================================================================<br>
> --- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
> +++ cfe/trunk/unittests/Format/FormatTest.cpp Thu May 16 05:17:39 2013<br>
> @@ -3043,6 +3043,8 @@ TEST_F(FormatTest, PullTrivialFunctionDe<br>
>                "  int a;\n"<br>
>                "#error {\n"<br>
>                "}");<br>
> +  verifyFormat("void f() {} // comment");<br>
> +  verifyFormat("void f() { int a; } // comment");<br>
><br>
>   verifyFormat("void f() { return 42; }", getLLVMStyleWithColumns(23));<br>
>   verifyFormat("void f() {\n  return 42;\n}", getLLVMStyleWithColumns(22));<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>
<br>
</div></div></blockquote></div><br></div>