Revert "clang-format: [js] Updates to Google's JavaScript style."
This reverts commit eefd2eaad43c5c2b17953ae7ed1e72b28e696f7b.
Apparently, this change was a bit premature.
llvm-svn: 221365
diff --git a/clang/unittests/Format/FormatTestJS.cpp b/clang/unittests/Format/FormatTestJS.cpp
index 30d7c37..6ee150c 100644
--- a/clang/unittests/Format/FormatTestJS.cpp
+++ b/clang/unittests/Format/FormatTestJS.cpp
@@ -55,27 +55,29 @@
verifyFormat("a != = b;");
verifyFormat("a === b;");
- verifyFormat("aaaaaaa\n === b;", getGoogleJSStyleWithColumns(10));
+ verifyFormat("aaaaaaa ===\n b;", getGoogleJSStyleWithColumns(10));
verifyFormat("a !== b;");
- verifyFormat("aaaaaaa\n !== b;", getGoogleJSStyleWithColumns(10));
- verifyFormat("if (a + b + c + d\n"
- " !== e + f + g)\n"
+ verifyFormat("aaaaaaa !==\n b;", getGoogleJSStyleWithColumns(10));
+ verifyFormat("if (a + b + c +\n"
+ " d !==\n"
+ " e + f + g)\n"
" q();",
getGoogleJSStyleWithColumns(20));
verifyFormat("a >> >= b;");
verifyFormat("a >>> b;");
- verifyFormat("aaaaaaa\n >>> b;", getGoogleJSStyleWithColumns(10));
+ verifyFormat("aaaaaaa >>>\n b;", getGoogleJSStyleWithColumns(10));
verifyFormat("a >>>= b;");
- verifyFormat("aaaaaaa\n >>>= b;", getGoogleJSStyleWithColumns(10));
- verifyFormat("if (a + b + c + d\n"
- " >>> e + f + g)\n"
+ verifyFormat("aaaaaaa >>>=\n b;", getGoogleJSStyleWithColumns(10));
+ verifyFormat("if (a + b + c +\n"
+ " d >>>\n"
+ " e + f + g)\n"
" q();",
getGoogleJSStyleWithColumns(20));
- verifyFormat("var x = aaaaaaaaaa\n"
- " ? bbbbbb\n"
- " : ccc;",
+ verifyFormat("var x = aaaaaaaaaa ?\n"
+ " bbbbbb :\n"
+ " ccc;",
getGoogleJSStyleWithColumns(20));
verifyFormat("var b = a.map((x) => x + 1);");
@@ -181,10 +183,11 @@
" }\n"
"};");
// FIXME: The formatting here probably isn't ideal.
- EXPECT_EQ("abc = xyz ? function() {\n"
- " return 1;\n"
- " }\n"
- " : function() {\n"
+ EXPECT_EQ("abc = xyz ?\n"
+ " function() {\n"
+ " return 1;\n"
+ " } :\n"
+ " function() {\n"
" return -1;\n"
"};",
format("abc=xyz?function(){return 1;}:function(){return -1;};"));