<div dir="ltr">Nice!<div><br></div><div>This also changes</div><div><br></div><div><div> NSTextField* field = [self newLabelWithFrame:</div><div> NSMakeRect(0, y, NSasdfasdfasdfWidthlistFrame, lineHeight)];</div>
</div><div><br></div><div>to become</div><div><br></div><div><div> NSTextField* field = [self newLabelWithFrame:NSMakeRect(</div><div> 0, y, NSasdfasdfasdfWidthlistFrame, lineHeight)];</div></div><div><br></div><div>
instead. It's good that the second line is now only indented 4 (PR16185), but breaking after : is better than breaking after ( I think (at least when the selector has only one part).</div><div><br></div><div><br></div>
<div>Also, if an argument is too long to fit in a single line, the argument gets indented 4 too much:</div><div><br></div><div><div> base::scoped_nsobject<NSNumber> directionValue([[NSNumber alloc]</div><div> initWithInteger:writingDirection + NSTextWritingDirectionOverride +</div>
<div> foooo]); // <- should align with "writingDirection"</div></div><div><br></div><div>(related: pr15349).</div><div><br></div><div>(Still definitely an improvement over the previous behavior.)</div>
<div><br></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Aug 1, 2013 at 4:13 PM, Daniel Jasper <span dir="ltr"><<a href="mailto:djasper@google.com" target="_blank">djasper@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: djasper<br>
Date: Thu Aug 1 18:13:03 2013<br>
New Revision: 187631<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=187631&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=187631&view=rev</a><br>
Log:<br>
clang-format: Operator precendence in ObjC method exprs.<br>
<br>
Patch (mostly) by Adam Strzelecki. Thanks!<br>
<br>
Before:<br>
[self aaaaaa:bbbbbbbbbbbbb<br>
aaaaaaaaaa:bbbbbbbbbbbbbbbbb<br>
aaaaa:bbbbbbbbbbb +<br>
bbbbbbbbbbbb aaaa:bbb];<br>
<br>
After:<br>
[self aaaaaa:bbbbbbbbbbbbb<br>
aaaaaaaaaa:bbbbbbbbbbbbbbbbb<br>
aaaaa:bbbbbbbbbbb + bbbbbbbbbbbb<br>
aaaa:bbb];<br>
<br>
This fixes <a href="http://llvm.org/PR16150" target="_blank">llvm.org/PR16150</a>.<br>
<br>
Modified:<br>
cfe/trunk/lib/Format/TokenAnnotator.cpp<br>
cfe/trunk/unittests/Format/FormatTest.cpp<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=187631&r1=187630&r2=187631&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=187631&r1=187630&r2=187631&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Format/TokenAnnotator.cpp (original)<br>
+++ cfe/trunk/lib/Format/TokenAnnotator.cpp Thu Aug 1 18:13:03 2013<br>
@@ -863,6 +863,11 @@ public:<br>
CurrentPrecedence = 1;<br>
else if (Current->Type == TT_BinaryOperator || Current->is(tok::comma))<br>
CurrentPrecedence = 1 + (int)Current->getPrecedence();<br>
+ else if (Current->Type == TT_ObjCSelectorName) {<br>
+ CurrentPrecedence = 1 + (int)prec::Assignment;<br>
+ if (Precedence == CurrentPrecedence)<br>
+ Start = Current;<br>
+ }<br>
}<br>
<br>
// At the end of the line or when an operator with higher precedence is<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=187631&r1=187630&r2=187631&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=187631&r1=187630&r2=187631&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
+++ cfe/trunk/unittests/Format/FormatTest.cpp Thu Aug 1 18:13:03 2013<br>
@@ -4787,17 +4787,17 @@ TEST_F(FormatTest, FormatObjCMethodExpr)<br>
verifyFormat(<br>
"void f() {\n"<br>
" if ((self = [super initWithContentRect:contentRect\n"<br>
- " styleMask:styleMask\n"<br>
+ " styleMask:styleMask ?: otherMask\n"<br>
" backing:NSBackingStoreBuffered\n"<br>
" defer:YES]))");<br>
<br>
verifyFormat(<br>
"[foo checkThatBreakingAfterColonWorksOk:\n"<br>
- " [bar ifItDoes:reduceOverallLineLengthLikeInThisCase]];");<br>
+ " [bar ifItDoes:reduceOverallLineLengthLikeInThisCase]];");<br>
<br>
verifyFormat("[myObj short:arg1 // Force line break\n"<br>
- " longKeyword:arg2\n"<br>
- " evenLongerKeyword:arg3\n"<br>
+ " longKeyword:arg2 != nil ? arg2 : @\"longKeyword\"\n"<br>
+ " evenLongerKeyword:arg3 ?: @\"evenLongerKeyword\"\n"<br>
" error:arg4];");<br>
verifyFormat(<br>
"void f() {\n"<br>
@@ -4834,6 +4834,10 @@ TEST_F(FormatTest, FormatObjCMethodExpr)<br>
"scoped_nsobject<NSTextField> message(\n"<br>
" // The frame will be fixed up when |-setMessageText:| is called.\n"<br>
" [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 0, 0)]);");<br>
+ verifyFormat("[self aaaaaa:bbbbbbbbbbbbb\n"<br>
+ " aaaaaaaaaa:bbbbbbbbbbbbbbbbb\n"<br>
+ " aaaaa:bbbbbbbbbbb + bbbbbbbbbbbb\n"<br>
+ " aaaa:bbb];");<br>
}<br>
<br>
TEST_F(FormatTest, ObjCAt) {<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>
</blockquote></div><br></div>