if (Current.TokenText == "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);
GoogleStyle.ColumnLimit = 100;
GoogleStyle.SpaceAfterCStyleCast = true;
} else if (Language == FormatStyle::LK_JavaScript) {
- GoogleStyle.BreakBeforeTernaryOperators = false;
+ GoogleStyle.BreakBeforeBinaryOperators = FormatStyle::BOS_NonAssignment;
GoogleStyle.MaxEmptyLinesToKeep = 3;
GoogleStyle.SpacesInContainerLiterals = false;
GoogleStyle.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline;
Style.Language = FormatStyle::LK_JavaScript;
Style.BreakBeforeTernaryOperators = true;
EXPECT_EQ(0, parseConfiguration("BasedOnStyle: Google", &Style).value());
- EXPECT_FALSE(Style.BreakBeforeTernaryOperators);
+ EXPECT_FALSE(Style.SpacesInContainerLiterals);
Style.BreakBeforeTernaryOperators = true;
EXPECT_EQ(0, parseConfiguration("---\n"
"Language: JavaScript\n"
"IndentWidth: 76\n"
"...\n", &Style).value());
- EXPECT_FALSE(Style.BreakBeforeTernaryOperators);
+ EXPECT_FALSE(Style.SpacesInContainerLiterals);
EXPECT_EQ(76u, Style.IndentWidth);
EXPECT_EQ(FormatStyle::LK_JavaScript, Style.Language);
}
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 +\n"
- " d !==\n"
- " e + f + g)\n"
+ verifyFormat("aaaaaaa\n !== b;", getGoogleJSStyleWithColumns(10));
+ verifyFormat("if (a + b + c + 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 +\n"
- " d >>>\n"
- " e + f + g)\n"
+ verifyFormat("aaaaaaa\n >>>= b;", getGoogleJSStyleWithColumns(10));
+ verifyFormat("if (a + b + c + 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);");
" }\n"
"};");
// FIXME: The formatting here probably isn't ideal.
- EXPECT_EQ("abc = xyz ?\n"
- " function() {\n"
- " return 1;\n"
- " } :\n"
- " function() {\n"
+ EXPECT_EQ("abc = xyz ? function() {\n"
+ " return 1;\n"
+ " }\n"
+ " : function() {\n"
" return -1;\n"
"};",
format("abc=xyz?function(){return 1;}:function(){return -1;};"));