<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Aug 30, 2013 at 3:27 AM, 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:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Author: djasper<br>
Date: Fri Aug 30 02:27:13 2013<br>
New Revision: 189657<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=189657&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=189657&view=rev</a><br>
Log:<br>
clang-format: Don't indent builders relative to "return".<br>
<br>
While this looks kind of nice, it wastes horizontal space and does not<br>
seem to be common in the LLVM codebase.<br>
<br>
Before:<br>
  return llvm::StringSwitch<Reference::Kind>(name)<br>
      .StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)<br>
      .StartsWith(".eh_frame", ORDER_EH_FRAME)<br>
      .StartsWith(".init", ORDER_INIT)<br>
      .StartsWith(".fini", ORDER_FINI)<br>
      .StartsWith(".hash", ORDER_HASH)<br>
      .Default(ORDER_TEXT);<br>
<br>
After:<br>
  return llvm::StringSwitch<Reference::Kind>(name)<br>
             .StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)<br>
             .StartsWith(".eh_frame", ORDER_EH_FRAME)<br>
             .StartsWith(".init", ORDER_INIT)<br>
             .StartsWith(".fini", ORDER_FINI)<br>
             .StartsWith(".hash", ORDER_HASH)<br>
             .Default(ORDER_TEXT);<br></blockquote><div><br></div><div><br></div><div><span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px">This Before/After is backwards, right? It seems opposite of what changed in the test.</span></div>
<div><br></div><div>-- Sean Silva</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<br>
Modified:<br>
    cfe/trunk/lib/Format/ContinuationIndenter.cpp<br>
    cfe/trunk/unittests/Format/FormatTest.cpp<br>
<br>
Modified: cfe/trunk/lib/Format/ContinuationIndenter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/ContinuationIndenter.cpp?rev=189657&r1=189656&r2=189657&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/ContinuationIndenter.cpp?rev=189657&r1=189656&r2=189657&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/Format/ContinuationIndenter.cpp (original)<br>
+++ cfe/trunk/lib/Format/ContinuationIndenter.cpp Fri Aug 30 02:27:13 2013<br>
@@ -460,7 +460,7 @@ unsigned ContinuationIndenter::moveState<br>
   }<br>
<br>
   // If return returns a binary expression, align after it.<br>
-  if (Current.is(tok::kw_return) && !Current.FakeLParens.empty())<br>
+  if (Current.is(tok::kw_return) && startsBinaryExpression(Current))<br>
     State.Stack.back().LastSpace = State.Column + 7;<br>
<br>
   // In ObjC method declaration we align on the ":" of parameters, but we need<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=189657&r1=189656&r2=189657&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=189657&r1=189656&r2=189657&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
+++ cfe/trunk/unittests/Format/FormatTest.cpp Fri Aug 30 02:27:13 2013<br>
@@ -2841,12 +2841,12 @@ TEST_F(FormatTest, AdaptiveOnePerLineFor<br>
 TEST_F(FormatTest, FormatsBuilderPattern) {<br>
   verifyFormat(<br>
       "return llvm::StringSwitch<Reference::Kind>(name)\n"<br>
-      "           .StartsWith(\".eh_frame_hdr\", ORDER_EH_FRAMEHDR)\n"<br>
-      "           .StartsWith(\".eh_frame\", ORDER_EH_FRAME)\n"<br>
-      "           .StartsWith(\".init\", ORDER_INIT)\n"<br>
-      "           .StartsWith(\".fini\", ORDER_FINI)\n"<br>
-      "           .StartsWith(\".hash\", ORDER_HASH)\n"<br>
-      "           .Default(ORDER_TEXT);\n");<br>
+      "    .StartsWith(\".eh_frame_hdr\", ORDER_EH_FRAMEHDR)\n"<br>
+      "    .StartsWith(\".eh_frame\", ORDER_EH_FRAME)\n"<br>
+      "    .StartsWith(\".init\", ORDER_INIT)\n"<br>
+      "    .StartsWith(\".fini\", ORDER_FINI)\n"<br>
+      "    .StartsWith(\".hash\", ORDER_HASH)\n"<br>
+      "    .Default(ORDER_TEXT);\n");<br>
<br>
   verifyFormat("return aaaaaaaaaaaaaaaaa->aaaaa().aaaaaaaaaaaaa().aaaaaa() <\n"<br>
                "       aaaaaaaaaaaaaaa->aaaaa().aaaaaaaaaaaaa().aaaaaa();");<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></div>