]> granicus.if.org Git - clang/commitdiff
clang-format: [JS] add space before operator 'in'.
authorDaniel Jasper <djasper@google.com>
Fri, 19 Sep 2014 10:48:15 +0000 (10:48 +0000)
committerDaniel Jasper <djasper@google.com>
Fri, 19 Sep 2014 10:48:15 +0000 (10:48 +0000)
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
unittests/Format/FormatTestJS.cpp

index db08f59b8432a83a04131f78053469306ba4ae3d..68e16268dff75ce2b5abec6f5909eea23f2fdec1 100644 (file)
@@ -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 =
index bf763388ffeb4fb18bd5172ff20111f2fe423b5b..52f45c7ddd1e07ef36caa2791796fa9a8fcaeed9 100644 (file)
@@ -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) {