From 467ddb161c3120141d89fcb81a0f2f9500c47177 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Mon, 12 Aug 2013 12:58:05 +0000 Subject: clang-format: Improve stream-formatting. Before: CHECK(controller->WriteProto(FLAGS_row_key, FLAGS_proto)) << "\"" << FLAGS_proto << "\""; After: SemaRef.Diag(Loc, diag::note_for_range_begin_end) << BEF << IsTemplate << Description << E->getType(); llvm-svn: 188175 --- clang/lib/Format/Format.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'clang/lib/Format/Format.cpp') diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index 322e8670068..6fe4d45d1d0 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -595,6 +595,12 @@ private: unsigned ContinuationIndent = std::max(State.Stack.back().LastSpace, State.Stack.back().Indent) + 4; if (Newline) { + // Breaking before the first "<<" is generally not desirable if the LHS is + // short. + if (Current.is(tok::lessless) && State.Stack.back().FirstLessLess == 0 && + State.Column <= Style.ColumnLimit / 2) + ExtraPenalty += Style.PenaltyBreakFirstLessLess; + State.Stack.back().ContainsLineBreak = true; if (Current.is(tok::r_brace)) { if (Current.BlockKind == BK_BracedInit) @@ -705,10 +711,6 @@ private: State.Stack.back().BreakBeforeParameter = true; } - // Breaking before the first "<<" is generally not desirable. - if (Current.is(tok::lessless) && State.Stack.back().FirstLessLess == 0) - ExtraPenalty += Style.PenaltyBreakFirstLessLess; - } else { if (Current.is(tok::equal) && (RootToken->is(tok::kw_for) || State.ParenLevel == 0) && -- cgit v1.2.3