From ed5723d05e9782a4ebcdf1b07423a23f7aa6b40a Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Wed, 10 Jun 2015 09:21:09 +0000 Subject: [PATCH] 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. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@239462 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Format/TokenAnnotator.cpp | 7 ++++--- unittests/Format/FormatTestJS.cpp | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index 78e6103bfc..8f2b608afb 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -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 && diff --git a/unittests/Format/FormatTestJS.cpp b/unittests/Format/FormatTestJS.cpp index efa845cd90..59dcc0889a 100644 --- a/unittests/Format/FormatTestJS.cpp +++ b/unittests/Format/FormatTestJS.cpp @@ -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. -- 2.50.1