From a400cab43adcc7361433e28a48a38f655e34a632 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Thu, 28 Feb 2013 15:04:12 +0000 Subject: Reduce penalty for splitting after "{" in static initializers. This fixes llvm.org/PR15379. Before: const uint8_t aaaaaaaaaaaaaaaaaaaaaa[0] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // comment 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // comment 0x00, 0x00, 0x00, 0x00 // comment }; After: const uint8_t aaaaaaaaaaaaaaaaaaaaaa[0] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // comment 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // comment 0x00, 0x00, 0x00, 0x00 // comment }; llvm-svn: 176262 --- clang/lib/Format/TokenAnnotator.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'clang/lib') diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index e127f4af8e5..b9e35126ec1 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -880,8 +880,6 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line, else return 100; } - if (Left.is(tok::l_brace) && Right.isNot(tok::l_brace)) - return 50; if (Left.is(tok::equal) && Right.is(tok::l_brace)) return 150; if (Left.is(tok::coloncolon)) @@ -917,7 +915,7 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line, return 20; if (Left.is(tok::l_paren) || Left.is(tok::l_square) || - Left.Type == TT_TemplateOpener) + Left.is(tok::l_brace) || Left.Type == TT_TemplateOpener) return 20; if (Right.is(tok::lessless)) { -- cgit v1.2.3