<div dir="ltr">Thank you!</div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Sep 11, 2014 at 4:47 PM, Roman Kashitsyn <span dir="ltr"><<a href="mailto:romankashicin@gmail.com" target="_blank">romankashicin@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: lifted<br>
Date: Thu Sep 11 09:47:20 2014<br>
New Revision: 217588<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=217588&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=217588&view=rev</a><br>
Log:<br>
Fix bug 20892 - clang-format does not handle C-style comments<br>
<br>
Summary:<br>
<a href="http://llvm.org/bugs/show_bug.cgi?id=20892" target="_blank">http://llvm.org/bugs/show_bug.cgi?id=20892</a><br>
<br>
Add support of C-style formatting enabling/disabling directives. Now the following two styles are supported:<br>
<br>
  // clang-format on<br>
  /* clang-format on */<br>
<br>
The flexibility in comments (support of extra spaces and/or slashes, etc.) is deliberately avoided to simplify search in large code bases.<br>
<br>
Reviewers: djasper<br>
<br>
Reviewed By: djasper<br>
<br>
Subscribers: cfe-commits, curdeius, klimek<br>
<br>
Differential Revision: <a href="http://reviews.llvm.org/D5309" target="_blank">http://reviews.llvm.org/D5309</a><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=217588&r1=217587&r2=217588&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=217588&r1=217587&r2=217588&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Format/Format.cpp (original)<br>
+++ cfe/trunk/lib/Format/Format.cpp Thu Sep 11 09:47:20 2014<br>
@@ -1725,11 +1725,18 @@ private:<br>
         Tok.Tok.setKind(tok::char_constant);<br>
       }<br>
     }<br>
-    if (Tok.is(tok::comment) && Tok.TokenText == "// clang-format on")<br>
+<br>
+    if (Tok.is(tok::comment) && (Tok.TokenText == "// clang-format on" ||<br>
+                                 Tok.TokenText == "/* clang-format on */")) {<br>
       FormattingDisabled = false;<br>
+    }<br>
+<br>
     Tok.Finalized = FormattingDisabled;<br>
-    if (Tok.is(tok::comment) && Tok.TokenText == "// clang-format off")<br>
+<br>
+    if (Tok.is(tok::comment) && (Tok.TokenText == "// clang-format off" ||<br>
+                                 Tok.TokenText == "/* clang-format off */")) {<br>
       FormattingDisabled = true;<br>
+    }<br>
   }<br>
 };<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=217588&r1=217587&r2=217588&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=217588&r1=217587&r2=217588&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
+++ cfe/trunk/unittests/Format/FormatTest.cpp Thu Sep 11 09:47:20 2014<br>
@@ -9355,6 +9355,16 @@ TEST_F(FormatTest, DisableRegions) {<br>
                    "  int j;\n"<br>
                    " // clang-format on\n"<br>
                    "   int   k;"));<br>
+  EXPECT_EQ("int i;\n"<br>
+            "/* clang-format off */\n"<br>
+            "  int j;\n"<br>
+            "/* clang-format on */\n"<br>
+            "int k;",<br>
+            format(" int  i;\n"<br>
+                   "   /* clang-format off */\n"<br>
+                   "  int j;\n"<br>
+                   " /* clang-format on */\n"<br>
+                   "   int   k;"));<br>
 }<br>
<br>
 TEST_F(FormatTest, DoNotCrashOnInvalidInput) {<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>