[PATCH] D118627: [clang-format] Don't break block comments when sorting includes.
Marek Kurdej via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Mon Jan 31 23:51:28 PST 2022
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG95bf0a9ebdb4: [clang-format] Don't break block comments when sorting includes. (authored by curdeius).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D118627/new/
https://reviews.llvm.org/D118627
Files:
clang/lib/Format/Format.cpp
clang/unittests/Format/SortIncludesTest.cpp
Index: clang/unittests/Format/SortIncludesTest.cpp
===================================================================
--- clang/unittests/Format/SortIncludesTest.cpp
+++ clang/unittests/Format/SortIncludesTest.cpp
@@ -70,6 +70,21 @@
{tooling::Range(25, 1)}));
}
+TEST_F(SortIncludesTest, TrailingComments) {
+ EXPECT_EQ("#include \"a.h\"\n"
+ "#include \"b.h\" /* long\n"
+ " * long\n"
+ " * comment*/\n"
+ "#include \"c.h\"\n"
+ "#include \"d.h\"\n",
+ sort("#include \"a.h\"\n"
+ "#include \"c.h\"\n"
+ "#include \"b.h\" /* long\n"
+ " * long\n"
+ " * comment*/\n"
+ "#include \"d.h\"\n"));
+}
+
TEST_F(SortIncludesTest, SortedIncludesUsingSortPriorityAttribute) {
FmtStyle.IncludeStyle.IncludeBlocks = tooling::IncludeStyle::IBS_Regroup;
FmtStyle.IncludeStyle.IncludeCategories = {
Index: clang/lib/Format/Format.cpp
===================================================================
--- clang/lib/Format/Format.cpp
+++ clang/lib/Format/Format.cpp
@@ -2678,6 +2678,15 @@
if (!FormattingOff && !MergeWithNextLine) {
if (IncludeRegex.match(Line, &Matches)) {
StringRef IncludeName = Matches[2];
+ if (Line.contains("/*") && !Line.contains("*/")) {
+ // #include with a start of a block comment, but without the end.
+ // Need to keep all the lines until the end of the comment together.
+ // FIXME: This is somehow simplified check that probably does not work
+ // correctly if there are multiple comments on a line.
+ Pos = Code.find("*/", SearchFrom);
+ Line = Code.substr(
+ Prev, (Pos != StringRef::npos ? Pos + 2 : Code.size()) - Prev);
+ }
int Category = Categories.getIncludePriority(
IncludeName,
/*CheckMainHeader=*/!MainIncludeFound && FirstIncludeBlock);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D118627.404831.patch
Type: text/x-patch
Size: 2049 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20220201/4d461685/attachment-0001.bin>
More information about the cfe-commits
mailing list