commit 3e12e87f98538c55c1eab79df79e5a00df6de8ec
author Daniel Jasper <djasper@google.com> Mon Jul 15 14:12:30 2013 +0000
committer Daniel Jasper <djasper@google.com> Mon Jul 15 14:12:30 2013 +0000
tree 843b021f821307b7414b8f9ba7ffe084c9d01d4b
parent d58915eae3849225070230c3b89ebf3d987a3270

Improve formatting of operator<< chains.

Before:
  llvm::outs() << "aaaaaaaaaaaaaaaa: " << aaaaaaaaaaaaaaaa << "aaaaaaaaaaaaaaaa: "
               << aaaaaaaaaaaaaaaa << "aaaaaaaaaaaaaaaa: " << aaaaaaaaaaaaaaaa;

After:
  llvm::outs() << "aaaaaaaaaaaaaaaa: " << aaaaaaaaaaaaaaaa
               << "aaaaaaaaaaaaaaaa: " << aaaaaaaaaaaaaaaa
               << "aaaaaaaaaaaaaaaa: " << aaaaaaaaaaaaaaaa;

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@186320 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Format/Format.cpp

diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index e1a0874..f66d95c 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -127,7 +127,7 @@
 
 void setDefaultPenalties(FormatStyle &Style) {
   Style.PenaltyBreakComment = 45;
-  Style.PenaltyBreakFirstLessLess = 100;
+  Style.PenaltyBreakFirstLessLess = 180;
   Style.PenaltyBreakString = 1000;
   Style.PenaltyExcessCharacter = 1000000;
 }

lib/Format/TokenAnnotator.cpp

diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index cdac8ab..b903597 100644
--- a/lib/Format/TokenAnnotator.cpp
+++ b/lib/Format/TokenAnnotator.cpp
@@ -1082,7 +1082,7 @@
       Content = Content.drop_back(1).drop_front(1).trim();
       if (Content.size() > 1 &&
           (Content.back() == ':' || Content.back() == '='))
-        return 20;
+        return 50;
     }
     return prec::Shift;
   }