Support for JavaScript === and !== operators.

Reviewers: klimek, djasper

Reviewed By: klimek

CC: cfe-commits, klimek
Differential Revision: http://llvm-reviews.chandlerc.com/D2231

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@195251 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index 074e1d78454b82ff49bdd0ae0f64d8d124ff2728..3aee3a03945e8eab3f5a9cee3cef98eb834241d8 100644 (file)
--- a/lib/Format/TokenAnnotator.cpp
+++ b/lib/Format/TokenAnnotator.cpp
@@ -1363,6 +1363,10 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
   if (Tok.isOneOf(tok::arrowstar, tok::periodstar) ||
       Tok.Previous->isOneOf(tok::arrowstar, tok::periodstar))
     return false;
+  // JavaScript identity operators ===, !==.
+  if (Tok.Previous->isOneOf(tok::equalequal, tok::exclaimequal) &&
+      Tok.is(tok::equal))
+    return false;
   if (!Style.SpaceBeforeAssignmentOperators &&
       Tok.getPrecedence() == prec::Assignment)
     return false;
@@ -1452,6 +1456,9 @@ bool TokenAnnotator::canBreakBefore(const AnnotatedLine &Line,
     return false;
   if (Left.is(tok::equal) && Line.Type == LT_VirtualFunctionDecl)
     return false;
+  // JavaScript identity operators ===, !==.
+  if (Left.isOneOf(tok::equalequal, tok::exclaimequal) && Right.is(tok::equal))
+    return false;
   if (Left.Previous) {
     if (Left.is(tok::l_paren) && Right.is(tok::l_paren) &&
         Left.Previous->is(tok::kw___attribute))

diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index d9ca12996fa0d2536876bca76e1f65d21bd90f07..433f3f70c8c8ca97cec5fce5889112389caa2b2f 100644 (file)
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -7309,5 +7309,13 @@ TEST_F(FormatTest, SpacesInAngles) {
   verifyFormat("A<A<int>>();", Spaces);
 }
 
+
+TEST_F(FormatTest, UnderstandsJavaScript) {
+  verifyFormat("a === b;");
+  verifyFormat("aaaaaaa === b;", getLLVMStyleWithColumns(10));
+  verifyFormat("a !== b;");
+  verifyFormat("aaaaaaa !== b;", getLLVMStyleWithColumns(10));
+}
+
 } // end namespace tooling
 } // end namespace clang