r299204 - clang-format: [JavaScript] Ignore QT keywords.

[Nico Weber via cfe-commits]

Please use style.isCpp() (spelling?) instead of comparing with LK_Cpp and
LK_ObjC.

On Mar 31, 2017 8:17 AM, "Daniel Jasper via cfe-commits" <
cfe-commits at lists.llvm.org> wrote:

Author: djasper
Date: Fri Mar 31 07:04:37 2017
New Revision: 299204

URL: http://llvm.org/viewvc/llvm-project?rev=299204&view=rev
Log:
clang-format: [JavaScript] Ignore QT keywords.

Modified:
    cfe/trunk/lib/Format/UnwrappedLineParser.cpp
    cfe/trunk/unittests/Format/FormatTestJS.cpp

Modified: cfe/trunk/lib/Format/UnwrappedLineParser.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/
UnwrappedLineParser.cpp?rev=299204&r1=299203&r2=299204&view=diff
============================================================
==================
--- cfe/trunk/lib/Format/UnwrappedLineParser.cpp (original)
+++ cfe/trunk/lib/Format/UnwrappedLineParser.cpp Fri Mar 31 07:04:37 2017
@@ -916,7 +916,9 @@ void UnwrappedLineParser::parseStructura
         return;
       }
     }
-    if (FormatTok->isOneOf(Keywords.kw_signals, Keywords.kw_qsignals,
+    if ((Style.Language == FormatStyle::LK_Cpp ||
+         Style.Language == FormatStyle::LK_ObjC) &&
+        FormatTok->isOneOf(Keywords.kw_signals, Keywords.kw_qsignals,
                            Keywords.kw_slots, Keywords.kw_qslots)) {
       nextToken();
       if (FormatTok->is(tok::colon)) {

Modified: cfe/trunk/unittests/Format/FormatTestJS.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/
Format/FormatTestJS.cpp?rev=299204&r1=299203&r2=299204&view=diff
============================================================
==================
--- cfe/trunk/unittests/Format/FormatTestJS.cpp (original)
+++ cfe/trunk/unittests/Format/FormatTestJS.cpp Fri Mar 31 07:04:37 2017
@@ -167,6 +167,8 @@ TEST_F(FormatTestJS, ReservedWordsMethod
 TEST_F(FormatTestJS, CppKeywords) {
   // Make sure we don't mess stuff up because of C++ keywords.
   verifyFormat("return operator && (aa);");
+  // .. or QT ones.
+  verifyFormat("slots: Slot[];");
 }

 TEST_F(FormatTestJS, ES6DestructuringAssignment) {


_______________________________________________
cfe-commits mailing list
cfe-commits at lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20170331/d1881286/attachment.html>