commit 7ff96ed7336b4f0efef05c10fd5ce5143918d4e1
author Daniel Jasper <djasper@google.com> Mon May 06 10:24:51 2013 +0000
committer Daniel Jasper <djasper@google.com> Mon May 06 10:24:51 2013 +0000
tree dbfca9761d618490f0a65553d46128f87ccb100d
parent 53e72cdcc0bc217cab33fa56858a0fe5b94ca453

Don't break comments after includes.

LLVM/Clang basically don't use such comments and for Google-style,
include-lines are explicitly exempt from the column limit. Also, for
most cases, where the column limit is violated, the "better" solution
would be to move the comment to before the include, which clang-format
cannot do (yet).

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

lib/Format/Format.cpp

diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index d251d4f..68626d2 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -643,7 +643,9 @@
       if (!DryRun)
         BBC->alignLines(Whitespaces);
       Token.reset(BBC);
-    } else if (Current.Type == TT_LineComment) {
+    } else if (Current.Type == TT_LineComment &&
+               (Current.Parent == NULL ||
+                Current.Parent->Type != TT_ImplicitStringLiteral)) {
       Token.reset(new BreakableLineComment(SourceMgr, Current, StartColumn));
     } else {
       return 0;

unittests/Format/FormatTest.cpp

diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index 98e6d47..4c948e8 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -2763,6 +2763,7 @@
                "#include \"string.h\"\n"
                "#include <a-a>\n"
                "#include < path with space >\n"
+               "#include \"abc.h\" // this is included for ABC\n"
                "#include \"some very long include paaaaaaaaaaaaaaaaaaaaaaath\"",
                getLLVMStyleWithColumns(35));