1 files changed, 4 insertions, 0 deletions
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index 0cfd9903cb..34bccb978e 100644
--- a/lib/Format/TokenAnnotator.cpp
+++ b/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;
   }