Fix a violated precondition in clang-format.
Make sure we do not try to change line comments that are non-regular, i.e. do
not start with "//" or "#". This can for example happen when "//" is
broken into two lines with an escaped newline.
GitOrigin-RevId: 4dcfae6a003aa541600e5af42c0bec5d8e1abef0
diff --git a/lib/Format/ContinuationIndenter.cpp b/lib/Format/ContinuationIndenter.cpp
index f56b7c7..5073f51 100644
--- a/lib/Format/ContinuationIndenter.cpp
+++ b/lib/Format/ContinuationIndenter.cpp
@@ -1984,11 +1984,17 @@
} else if (Current.is(TT_LineComment) &&
(Current.Previous == nullptr ||
Current.Previous->isNot(TT_ImplicitStringLiteral))) {
+ bool RegularComments = [&]() {
+ for (const FormatToken *T = &Current; T && T->is(TT_LineComment);
+ T = T->Next) {
+ if (!(T->TokenText.startswith("//") || T->TokenText.startswith("#")))
+ return false;
+ }
+ return true;
+ }();
if (!Style.ReflowComments ||
CommentPragmasRegex.match(Current.TokenText.substr(2)) ||
- switchesFormatting(Current) ||
- !(Current.TokenText.startswith("//") ||
- Current.TokenText.startswith("#")))
+ switchesFormatting(Current) || !RegularComments)
return nullptr;
return std::make_unique<BreakableLineCommentSection>(
Current, StartColumn, /*InPPDirective=*/false, Encoding, Style);
diff --git a/unittests/Format/FormatTestComments.cpp b/unittests/Format/FormatTestComments.cpp
index 2a7ead6..b5db353 100644
--- a/unittests/Format/FormatTestComments.cpp
+++ b/unittests/Format/FormatTestComments.cpp
@@ -3978,6 +3978,18 @@
format(Code, Style));
}
+TEST_F(FormatTestComments, SplitCommentIntroducers) {
+ EXPECT_EQ(R"(//
+/\
+/
+)",
+ format(R"(//
+/\
+/
+ )",
+ getLLVMStyleWithColumns(10)));
+}
+
} // end namespace
} // end namespace format
} // end namespace clang
