clang-format: [JS] Only special case top level object literal
assignments as enums. Top level object literals are treated as enums, and their k/v pairs are put on separate lines: X.Y = { A: 1, B: 2 }; However assignments within blocks should not be affected: function x() { y = {a:1, b:2}; } This change fixes the second case. Patch by Martin Probst. llvm-svn: 239462
This commit is contained in:
parent
ef40f0bbff
commit
11ca263994
|
@ -2088,13 +2088,14 @@ bool TokenAnnotator::mustBreakBefore(const AnnotatedLine &Line,
|
|||
Left.Previous->is(tok::char_constant))
|
||||
return true;
|
||||
if (Left.is(TT_DictLiteral) && Left.is(tok::l_brace) &&
|
||||
Left.NestingLevel == 0 && Left.Previous &&
|
||||
Line.Level == 0 && Left.Previous &&
|
||||
Left.Previous->is(tok::equal) &&
|
||||
Line.First->isOneOf(tok::identifier, Keywords.kw_import,
|
||||
tok::kw_export) &&
|
||||
tok::kw_export, tok::kw_const) &&
|
||||
// kw_var is a pseudo-token that's a tok::identifier, so matches above.
|
||||
!Line.First->is(Keywords.kw_var))
|
||||
// Enum style object literal.
|
||||
// Object literals on the top level of a file are treated as "enum-style".
|
||||
// Each key/value pair is put on a separate line, instead of bin-packing.
|
||||
return true;
|
||||
} else if (Style.Language == FormatStyle::LK_Java) {
|
||||
if (Right.is(tok::plus) && Left.is(tok::string_literal) && Right.Next &&
|
||||
|
|
|
@ -146,6 +146,10 @@ TEST_F(FormatTestJS, ContainerLiterals) {
|
|||
// Enum style top level assignment.
|
||||
verifyFormat("X = {\n a: 123\n};");
|
||||
verifyFormat("X.Y = {\n a: 123\n};");
|
||||
// But only on the top level, otherwise its a plain object literal assignment.
|
||||
verifyFormat("function x() {\n"
|
||||
" y = {z: 1};\n"
|
||||
"}");
|
||||
verifyFormat("x = foo && {a: 123};");
|
||||
|
||||
// Arrow functions in object literals.
|
||||
|
|
Loading…
Reference in New Issue