https://github.com/owenca created
https://github.com/llvm/llvm-project/pull/146202
Fixes #39150
>From 00c0c25a5f17a0077cfc86600203888891684aa5 Mon Sep 17 00:00:00 2001
From: Owen Pan <owenpi...@gmail.com>
Date: Sat, 28 Jun 2025 00:25:02 -0700
Subject: [PATCH] [clang-format] Fix a bug in `ReflowComments: Always`
Fixes #39150
---
clang/lib/Format/BreakableToken.cpp | 3 +--
clang/unittests/Format/FormatTestComments.cpp | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/clang/lib/Format/BreakableToken.cpp
b/clang/lib/Format/BreakableToken.cpp
index 5317c05f3a460..def0d73e77539 100644
--- a/clang/lib/Format/BreakableToken.cpp
+++ b/clang/lib/Format/BreakableToken.cpp
@@ -158,8 +158,7 @@ getCommentSplit(StringRef Text, unsigned ContentStartColumn,
return BreakableToken::Split(StringRef::npos, 0);
StringRef BeforeCut = Text.substr(0, SpaceOffset).rtrim(Blanks);
StringRef AfterCut = Text.substr(SpaceOffset);
- // Don't trim the leading blanks if it would create a */ after the break.
- if (!DecorationEndsWithStar || AfterCut.size() <= 1 || AfterCut[1] != '/')
+ if (!DecorationEndsWithStar)
AfterCut = AfterCut.ltrim(Blanks);
return BreakableToken::Split(BeforeCut.size(),
AfterCut.begin() - BeforeCut.end());
diff --git a/clang/unittests/Format/FormatTestComments.cpp
b/clang/unittests/Format/FormatTestComments.cpp
index 5eefd767706a3..a16fbffb76270 100644
--- a/clang/unittests/Format/FormatTestComments.cpp
+++ b/clang/unittests/Format/FormatTestComments.cpp
@@ -2486,7 +2486,7 @@ TEST_F(FormatTestComments, BlockComments) {
EXPECT_EQ("/*\n"
"**\n"
"* aaaaaa\n"
- "*aaaaaa\n"
+ "* aaaaaa\n"
"*/",
format("/*\n"
"**\n"
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
