clang-format: Fix for r204456.

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

diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index 08f2b27ed580ba80cf4fe25eef8c2a14dc7ef654..c3cc000044bf935461eadd99b7087b76f91725ce 100644 (file)
--- a/lib/Format/TokenAnnotator.cpp
+++ b/lib/Format/TokenAnnotator.cpp
@@ -1122,7 +1122,7 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) {
       //   SomeFunction(a,
       //                b, // comment
       //                c);
-      if (Current->isTrailingComment()) {
+      if (!Current->HasUnescapedNewline) {
         for (FormatToken *Parameter = Current->Previous; Parameter;
              Parameter = Parameter->Previous) {
           if (Parameter->isOneOf(tok::comment, tok::r_brace))

diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index 537a01f954f7ca1dbbea8751daa1206d59d5307d..bd926f63a6b817ac03f68c3dae74207a1b6c7fb2 100644 (file)
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -784,6 +784,13 @@ TEST_F(FormatTest, KeepsParameterWithTrailingCommentsOnTheirOwnLine) {
             format("SomeFunction(a,\n"
                    "          b, // comment\n"
                    "      c);"));
+  EXPECT_EQ("SomeFunction(a, b,\n"
+            "             // comment\n"
+            "             c);",
+            format("SomeFunction(a,\n"
+                   "          b,\n"
+                  "  // comment\n"
+                   "      c);"));
   EXPECT_EQ("SomeFunction(a, b, // comment (unclear relation)\n"
             "             c);",
             format("SomeFunction(a, b, // comment (unclear relation)\n"