<div dir="ltr">Thanks!</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Mar 10, 2014 at 11:06 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:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: djasper<br>
Date: Mon Mar 10 10:06:25 2014<br>
New Revision: 203466<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=203466&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=203466&view=rev</a><br>
Log:<br>
clang-format: Add spaces between lambdas and comments.<br>
<br>
Before:<br>
  void f() {<br>
    bar([]() {}// Does not respect SpacesBeforeTrailingComments<br>
        );<br>
  }<br>
<br>
After:<br>
  void f() {<br>
    bar([]() {} // Does not respect SpacesBeforeTrailingComments<br>
        );<br>
  }<br>
<br>
This fixes <a href="http://llvm.org/PR19017" target="_blank">llvm.org/PR19017</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=203466&r1=203465&r2=203466&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=203466&r1=203465&r2=203466&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/Format/TokenAnnotator.cpp (original)<br>
+++ cfe/trunk/lib/Format/TokenAnnotator.cpp Mon Mar 10 10:06:25 2014<br>
@@ -1100,7 +1100,8 @@ void TokenAnnotator::calculateFormatting<br>
   bool InFunctionDecl = Line.MightBeFunctionDecl;<br>
   while (Current != NULL) {<br>
     if (Current->Type == TT_LineComment) {<br>
-      if (Current->Previous->BlockKind == BK_BracedInit)<br>
+      if (Current->Previous->BlockKind == BK_BracedInit &&<br>
+          Current->Previous->opensScope())<br>
         Current->SpacesRequiredBefore = Style.Cpp11BracedListStyle ? 0 : 1;<br>
       else<br>
         Current->SpacesRequiredBefore = Style.SpacesBeforeTrailingComments;<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=203466&r1=203465&r2=203466&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=203466&r1=203465&r2=203466&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
+++ cfe/trunk/unittests/Format/FormatTest.cpp Mon Mar 10 10:06:25 2014<br>
@@ -7980,6 +7980,12 @@ TEST_F(FormatTest, FormatsLambdas) {<br>
   verifyFormat("double &operator[](int i) { return 0; }\n"<br>
                "int i;");<br>
   verifyFormat("std::unique_ptr<int[]> foo() {}");<br>
+<br>
+  // Other corner cases.<br>
+  verifyFormat("void f() {\n"<br>
+               "  bar([]() {} // Did not respect SpacesBeforeTrailingComments\n"<br>
+               "      );\n"<br>
+               "}");<br>
 }<br>
<br>
 TEST_F(FormatTest, FormatsBlocks) {<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>