commit 8bb99e891121beb4f8d659c46f800992e9f7f60b
author Daniel Jasper <djasper@google.com> Thu May 16 12:59:13 2013 +0000
committer Daniel Jasper <djasper@google.com> Thu May 16 12:59:13 2013 +0000
tree d5800d460920e93dd2e95e0689cd93ef474a90cd
parent efb6172cb311012119ac746659c22a073a5d423f

Don't insert a break into include lines with trailing comments.

llvm-svn: 182003

clang/lib/Format/Format.cpp

diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 6631c67..6966aab 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -777,7 +777,8 @@
     llvm::OwningPtr<BreakableToken> Token;
     unsigned StartColumn = State.Column - Current.FormatTok.TokenLength -
                            UnbreakableTailLength;
-    if (Current.is(tok::string_literal)) {
+    if (Current.is(tok::string_literal) &&
+        Current.Type != TT_ImplicitStringLiteral) {
       // Only break up default narrow strings.
       const char *LiteralData = SourceMgr.getCharacterData(
           Current.FormatTok.getStartOfNonWhitespace());