From 7c9c05076969157661e2ba20d6e12dfb04f7976f Mon Sep 17 00:00:00 2001
From: Alexander Kornienko <alexfh@google.com>
Date: Wed, 20 Nov 2013 14:30:26 +0000
Subject: [PATCH] Support for JavaScript === and !== operators.
Reviewers: klimek, djasper
Reviewed By: klimek
CC: cfe-commits, klimek
Differential Revision: http://llvm-reviews.chandlerc.com/D2231
llvm-svn: 195251
---
clang/lib/Format/TokenAnnotator.cpp | 7 +++++++
clang/unittests/Format/FormatTest.cpp | 8 ++++++++
2 files changed, 15 insertions(+)
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 074e1d78454b..3aee3a03945e 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/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/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
index d9ca12996fa0..433f3f70c8c8 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/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