From 1f8f132eb3462e706136db308bbe1ec5f2d2aa01 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Wed, 5 Nov 2014 17:22:31 +0000 Subject: [PATCH] Revert "clang-format: [js] Updates to Google's JavaScript style." This reverts commit eefd2eaad43c5c2b17953ae7ed1e72b28e696f7b. Apparently, this change was a bit premature. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@221365 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Format/ContinuationIndenter.cpp | 1 - lib/Format/Format.cpp | 2 +- unittests/Format/FormatTest.cpp | 4 ++-- unittests/Format/FormatTestJS.cpp | 33 ++++++++++++++++------------- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/lib/Format/ContinuationIndenter.cpp b/lib/Format/ContinuationIndenter.cpp index adbd8a3d1d..9e6014a683 100644 --- a/lib/Format/ContinuationIndenter.cpp +++ b/lib/Format/ContinuationIndenter.cpp @@ -677,7 +677,6 @@ unsigned ContinuationIndenter::moveStateToNextToken(LineState &State, if (Current.is(Keywords.kw_function)) State.Stack.back().JSFunctionInlined = !Newline && Previous && Previous->Type != TT_DictLiteral && - Previous->Type != TT_ConditionalExpr && // If the unnamed function is the only parameter to another function, // we can likely inline it and come up with a good format. (Previous->isNot(tok::l_paren) || Previous->ParameterCount > 1); diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index 1eb6d97fc5..8e4be3e053 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -416,7 +416,7 @@ FormatStyle getGoogleStyle(FormatStyle::LanguageKind Language) { GoogleStyle.ColumnLimit = 100; GoogleStyle.SpaceAfterCStyleCast = true; } else if (Language == FormatStyle::LK_JavaScript) { - GoogleStyle.BreakBeforeBinaryOperators = FormatStyle::BOS_NonAssignment; + GoogleStyle.BreakBeforeTernaryOperators = false; GoogleStyle.MaxEmptyLinesToKeep = 3; GoogleStyle.SpacesInContainerLiterals = false; GoogleStyle.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline; diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index b94d0f5f98..9d62fbe14f 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -8716,7 +8716,7 @@ TEST_F(FormatTest, UsesLanguageForBasedOnStyle) { Style.Language = FormatStyle::LK_JavaScript; Style.BreakBeforeTernaryOperators = true; EXPECT_EQ(0, parseConfiguration("BasedOnStyle: Google", &Style).value()); - EXPECT_FALSE(Style.SpacesInContainerLiterals); + EXPECT_FALSE(Style.BreakBeforeTernaryOperators); Style.BreakBeforeTernaryOperators = true; EXPECT_EQ(0, parseConfiguration("---\n" @@ -8725,7 +8725,7 @@ TEST_F(FormatTest, UsesLanguageForBasedOnStyle) { "Language: JavaScript\n" "IndentWidth: 76\n" "...\n", &Style).value()); - EXPECT_FALSE(Style.SpacesInContainerLiterals); + EXPECT_FALSE(Style.BreakBeforeTernaryOperators); EXPECT_EQ(76u, Style.IndentWidth); EXPECT_EQ(FormatStyle::LK_JavaScript, Style.Language); } diff --git a/unittests/Format/FormatTestJS.cpp b/unittests/Format/FormatTestJS.cpp index 30d7c37818..6ee150c662 100644 --- a/unittests/Format/FormatTestJS.cpp +++ b/unittests/Format/FormatTestJS.cpp @@ -55,27 +55,29 @@ TEST_F(FormatTestJS, UnderstandsJavaScriptOperators) { 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 @@ TEST_F(FormatTestJS, FunctionLiterals) { " }\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;};")); -- 2.40.0