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
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 322e867..6fe4d45 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -595,6 +595,12 @@
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 @@
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) &&