Improve formatting of stream operators.

If there are string literals on either side of a '<<', chances are
high that they represent logically separate concepts. Otherwise,
the author could just have just a single literal (possible split
over multiple lines).

So, we can now nicely format things like:
cout << "somepacket = {\n"
     << "  val a = " << ValueA << "\n"
     << "  val b = " << ValueB << "\n"
     << "}";

llvm-svn: 174310

1 files changed, 4 insertions, 0 deletions

diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 0cfd9903cb8..34bccb978e7 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -669,6 +669,10 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedToken &Current) {
              (Current.is(tok::string_literal) &&
               Current.Parent->is(tok::string_literal))) {
     Current.MustBreakBefore = true;
+  } else if (Current.is(tok::lessless) && !Current.Children.empty() &&
+             Current.Parent->is(tok::string_literal) &&
+             Current.Children[0].is(tok::string_literal)) {
+    Current.MustBreakBefore = true;
   } else {
     Current.MustBreakBefore = false;
   }