maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clang-format] turn on formatting after "clang-format on" while sorting includes 

Formatting is not active after "clang-format on" due to merging lines while formatting is off. Also, use trimmed line. Behaviour with LF is different than with CRLF.

Reviewed By: curdeius, MyDeveloperDay

Differential Revision: https://reviews.llvm.org/D94206
This commit is contained in:
Rafał Jelonek 2021-01-11 09:34:01 +01:00 committed by Marek Kurdej
parent 0c8b748f32
commit 7473940bae
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/lib/Format/Format.cpp
View File

@ -2291,7 +2291,8 @@ tooling::Replacements sortCppIncludes(const FormatStyle &Style, StringRef Code,
Style.IncludeStyle.IncludeBlocks ==
tooling::IncludeStyle::IBS_Regroup);
if (!FormattingOff && !Line.endswith("\\")) {
bool MergeWithNextLine = Trimmed.endswith("\\");
if (!FormattingOff && !MergeWithNextLine) {
if (IncludeRegex.match(Line, &Matches)) {
StringRef IncludeName = Matches[2];
int Category = Categories.getIncludePriority(
@ -2309,10 +2310,12 @@ tooling::Replacements sortCppIncludes(const FormatStyle &Style, StringRef Code,
IncludesInBlock.clear();
FirstIncludeBlock = false;
}
Prev = Pos + 1;
}
if (Pos == StringRef::npos || Pos + 1 == Code.size())
break;
if (!MergeWithNextLine)
Prev = Pos + 1;
SearchFrom = Pos + 1;
}
if (!IncludesInBlock.empty()) {

37
clang/unittests/Format/SortIncludesTest.cpp
View File

@ -207,6 +207,27 @@ TEST_F(SortIncludesTest, SupportClangFormatOff) {
"#include <a>\n"
"#include <c>\n"
"// clang-format on\n"));
Style.IncludeBlocks = Style.IBS_Merge;
std::string Code = "// clang-format off\r\n"
"#include \"d.h\"\r\n"
"#include \"b.h\"\r\n"
"// clang-format on\r\n"
"\r\n"
"#include \"c.h\"\r\n"
"#include \"a.h\"\r\n"
"#include \"e.h\"\r\n";
std::string Expected = "// clang-format off\r\n"
"#include \"d.h\"\r\n"
"#include \"b.h\"\r\n"
"// clang-format on\r\n"
"\r\n"
"#include \"e.h\"\r\n"
"#include \"a.h\"\r\n"
"#include \"c.h\"\r\n";
EXPECT_EQ(Expected, sort(Code, "e.cpp", 1));
}
TEST_F(SortIncludesTest, SupportClangFormatOffCStyle) {
@ -915,6 +936,22 @@ TEST_F(SortIncludesTest, skipUTF8ByteOrderMarkPreserve) {
EXPECT_EQ(Expected, sort(Code, "e.cpp", 2));
}
TEST_F(SortIncludesTest, MergeLines) {
Style.IncludeBlocks = Style.IBS_Merge;
std::string Code = "#include \"c.h\"\r\n"
"#include \"b\\\r\n"
".h\"\r\n"
"#include \"a.h\"\r\n";
std::string Expected = "#include \"a.h\"\r\n"
"#include \"b\\\r\n"
".h\"\r\n"
"#include \"c.h\"\r\n";
EXPECT_EQ(Expected, sort(Code, "a.cpp", 1));
}
} // end namespace
} // end namespace format
} // end namespace clang