<div dir="ltr">Well, the general rule we are trying to follow is to try and keep inner expressions together if possible (we have to split at two points between/before parameters of the function call, but there is no need to also split the addition).<div>
<br></div><div>I think in the example, the individual parameters to the function call are easier to see. I don't feel all that strongly, but we have had requests from multiple users.</div></div><div class="gmail_extra">
<br><br><div class="gmail_quote">On Wed, Mar 20, 2013 at 7:34 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">
Really? I'm not sure this is an improvement. The dangling left-paren looks stranger to me than the wrapped expression...although I would have indented the wrapped expression one more level.<br>
<div class="HOEnZb"><div class="h5"><br>
<br>
On Mar 20, 2013, at 6:53 , Daniel Jasper <<a href="mailto:djasper@google.com">djasper@google.com</a>> wrote:<br>
<br>
> Author: djasper<br>
> Date: Wed Mar 20 08:53:11 2013<br>
> New Revision: 177521<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=177521&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=177521&view=rev</a><br>
> Log:<br>
> Reduce penalty for breaks after "(" for functions with parameters.<br>
><br>
> Before:<br>
> aaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +<br>
> aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,<br>
> aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);<br>
> After:<br>
> aaaaaaaaaaaaaaaaa(<br>
> aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,<br>
> aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);<br>
><br>
> Modified:<br>
> cfe/trunk/lib/Format/Format.cpp<br>
> cfe/trunk/lib/Format/TokenAnnotator.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=177521&r1=177520&r2=177521&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=177521&r1=177520&r2=177521&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/Format/Format.cpp (original)<br>
> +++ cfe/trunk/lib/Format/Format.cpp Wed Mar 20 08:53:11 2013<br>
> @@ -372,8 +372,8 @@ private:<br>
> void alignComments(comment_iterator I, comment_iterator E, unsigned Column) {<br>
> while (I != E) {<br>
> unsigned Spaces = I->Spaces + Column - I->MinColumn;<br>
> - storeReplacement(I->Tok, std::string(I->NewLines, '\n') +<br>
> - std::string(Spaces, ' '));<br>
> + storeReplacement(<br>
> + I->Tok, std::string(I->NewLines, '\n') + std::string(Spaces, ' '));<br>
> ++I;<br>
> }<br>
> }<br>
><br>
> Modified: cfe/trunk/lib/Format/TokenAnnotator.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=177521&r1=177520&r2=177521&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=177521&r1=177520&r2=177521&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/Format/TokenAnnotator.cpp (original)<br>
> +++ cfe/trunk/lib/Format/TokenAnnotator.cpp Wed Mar 20 08:53:11 2013<br>
> @@ -937,7 +937,7 @@ unsigned TokenAnnotator::splitPenalty(co<br>
> return 20;<br>
><br>
> if (opensScope(Left))<br>
> - return 20;<br>
> + return Left.ParameterCount > 1 ? prec::Comma : 20;<br>
><br>
> if (Right.is(tok::lessless)) {<br>
> if (Left.is(tok::string_literal)) {<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=177521&r1=177520&r2=177521&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=177521&r1=177520&r2=177521&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
> +++ cfe/trunk/unittests/Format/FormatTest.cpp Wed Mar 20 08:53:11 2013<br>
> @@ -1485,6 +1485,10 @@ TEST_F(FormatTest, BreaksDesireably) {<br>
> verifyFormat(<br>
> "aaaaaa(aaa, new Aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"<br>
> " aaaaaaaaaaaaaaaaaaaaaaaaaaaaa));");<br>
> + verifyFormat(<br>
> + "aaaaaaaaaaaaaaaaa(\n"<br>
> + " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"<br>
> + " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");<br>
><br>
> // This test case breaks on an incorrect memoization, i.e. an optimization not<br>
> // taking into account the StopAt value.<br>
> @@ -1677,7 +1681,7 @@ TEST_F(FormatTest, BreaksConditionalExpr<br>
> " : aaaaaaaaaaaaa);");<br>
> verifyFormat(<br>
> "aaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaa,\n"<br>
> - " aaaaaaaaaaaaaaaa ? aaaaaaaaaaaaaaaaaaaaaaa\n"<br>
> + " aaaaaaaaaaaaaaaa ? aaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"<br>
> " : aaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"<br>
> " aaaaaaaaaaaaa);");<br>
> verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"<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>