From 883ae9d9a3c1056ff9910b639f5538b901dc2ca8 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Tue, 29 Apr 2014 15:54:14 +0000 Subject: clang-format: Don't bin-pack text-proto-formatted options. Before: repeated double value = 1 [(aaaaaaa.aaaaaaaaa) = {aaaaaaaaaaaaaaaa: AAAAAAAAAA, bbbbbbb: BBBB, bbbb: BBB}]; After: repeated double value = 1 [(aaaaaaa.aaaaaaaaa) = {aaaaaaaaaaaaaaaa: AAAAAAAAAA, bbbbbbb: BBBB, bbbb: BBB}]; llvm-svn: 207538 --- clang/lib/Format/ContinuationIndenter.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'clang/lib/Format/ContinuationIndenter.cpp') diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp index 26eb7e1bd4b..41a42d1e60e 100644 --- a/clang/lib/Format/ContinuationIndenter.cpp +++ b/clang/lib/Format/ContinuationIndenter.cpp @@ -725,6 +725,7 @@ unsigned ContinuationIndenter::moveStateToNextToken(LineState &State, AvoidBinPacking = Current.BlockKind == BK_Block || Current.Type == TT_ArrayInitializerLSquare || Current.Type == TT_DictLiteral || + Style.Language == FormatStyle::LK_Proto || !Style.BinPackParameters || (NextNoComment && NextNoComment->Type == TT_DesignatedInitializerPeriod); -- cgit v1.2.3