<div dir="auto"><div>Please use style.isCpp() (spelling?) instead of comparing with LK_Cpp and LK_ObjC.<br><div class="gmail_extra"><br><div class="gmail_quote">On Mar 31, 2017 8:17 AM, "Daniel Jasper via cfe-commits" <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br type="attribution"><blockquote class="quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: djasper<br>
Date: Fri Mar 31 07:04:37 2017<br>
New Revision: 299204<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=299204&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=299204&view=rev</a><br>
Log:<br>
clang-format: [JavaScript] Ignore QT keywords.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Format/<wbr>UnwrappedLineParser.cpp<br>
    cfe/trunk/unittests/Format/<wbr>FormatTestJS.cpp<br>
<br>
Modified: cfe/trunk/lib/Format/<wbr>UnwrappedLineParser.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/UnwrappedLineParser.cpp?rev=299204&r1=299203&r2=299204&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Format/<wbr>UnwrappedLineParser.cpp?rev=<wbr>299204&r1=299203&r2=299204&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Format/<wbr>UnwrappedLineParser.cpp (original)<br>
+++ cfe/trunk/lib/Format/<wbr>UnwrappedLineParser.cpp Fri Mar 31 07:04:37 2017<br>
@@ -916,7 +916,9 @@ void UnwrappedLineParser::<wbr>parseStructura<br>
         return;<br>
       }<br>
     }<br>
-    if (FormatTok->isOneOf(Keywords.<wbr>kw_signals, Keywords.kw_qsignals,<br>
+    if ((Style.Language == FormatStyle::LK_Cpp ||<br>
+         Style.Language == FormatStyle::LK_ObjC) &&<br>
+        FormatTok->isOneOf(Keywords.<wbr>kw_signals, Keywords.kw_qsignals,<br>
                            Keywords.kw_slots, Keywords.kw_qslots)) {<br>
       nextToken();<br>
       if (FormatTok->is(tok::colon)) {<br>
<br>
Modified: cfe/trunk/unittests/Format/<wbr>FormatTestJS.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTestJS.cpp?rev=299204&r1=299203&r2=299204&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/unittests/<wbr>Format/FormatTestJS.cpp?rev=<wbr>299204&r1=299203&r2=299204&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/unittests/Format/<wbr>FormatTestJS.cpp (original)<br>
+++ cfe/trunk/unittests/Format/<wbr>FormatTestJS.cpp Fri Mar 31 07:04:37 2017<br>
@@ -167,6 +167,8 @@ TEST_F(FormatTestJS, ReservedWordsMethod<br>
 TEST_F(FormatTestJS, CppKeywords) {<br>
   // Make sure we don't mess stuff up because of C++ keywords.<br>
   verifyFormat("return operator && (aa);");<br>
+  // .. or QT ones.<br>
+  verifyFormat("slots: Slot[];");<br>
 }<br>
<br>
 TEST_F(FormatTestJS, ES6DestructuringAssignment) {<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div></div>