From 38fe1ee4f6f34bca9c0ffdd22f2e9f1bf5445e78 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Fri, 19 Sep 2014 10:48:15 +0000 Subject: [PATCH] clang-format: [JS] add space before operator 'in'. Before: return ('aaa')in bbbb; After: return ('aaa') in bbbb; git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@218119 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Format/TokenAnnotator.cpp | 3 +++ unittests/Format/FormatTestJS.cpp | 1 + 2 files changed, 4 insertions(+) diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index db08f59b84..68e16268df 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -868,6 +868,9 @@ private: Tok.Previous->Type == TT_PointerOrReference || Tok.Previous->Type == TT_TemplateCloser || Tok.Previous->isSimpleTypeSpecifier(); + if (Style.Language == FormatStyle::LK_JavaScript && Tok.Next && + Tok.Next->TokenText == "in") + return false; bool ParensCouldEndDecl = Tok.Next && Tok.Next->isOneOf(tok::equal, tok::semi, tok::l_brace); bool IsSizeOfOrAlignOf = diff --git a/unittests/Format/FormatTestJS.cpp b/unittests/Format/FormatTestJS.cpp index bf763388ff..52f45c7ddd 100644 --- a/unittests/Format/FormatTestJS.cpp +++ b/unittests/Format/FormatTestJS.cpp @@ -81,6 +81,7 @@ TEST_F(FormatTestJS, UnderstandsJavaScriptOperators) { getGoogleJSStyleWithColumns(20)); verifyFormat("var b = a.map((x) => x + 1);"); + verifyFormat("return ('aaa') in bbbb;"); } TEST_F(FormatTestJS, UnderstandsAmpAmp) { -- 2.50.1