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

clang-format: Make sorting includes respect // clang-format off 

llvm-svn: 253772
This commit is contained in:
Daniel Jasper 2015-11-21 09:17:08 +00:00
parent 9f3c12565f
commit 9b8c7c72f5
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1780,11 +1780,20 @@ tooling::Replacements sortIncludes(const FormatStyle &Style, StringRef Code,
for (const auto &Category : Style.IncludeCategories) for (const auto &Category : Style.IncludeCategories)
CategoryRegexs.emplace_back(Category.Regex); CategoryRegexs.emplace_back(Category.Regex);
bool FormattingOff = false;
for (;;) { for (;;) {
auto Pos = Code.find('\n', SearchFrom); auto Pos = Code.find('\n', SearchFrom);
StringRef Line = StringRef Line =
Code.substr(Prev, (Pos != StringRef::npos ? Pos : Code.size()) - Prev); Code.substr(Prev, (Pos != StringRef::npos ? Pos : Code.size()) - Prev);
if (!Line.endswith("\\")) {
StringRef Trimmed = Line.trim();
if (Trimmed == "// clang-format off")
FormattingOff = true;
else if (Trimmed == "// clang-format on")
FormattingOff = false;
if (!FormattingOff && !Line.endswith("\\")) {
if (IncludeRegex.match(Line, &Matches)) { if (IncludeRegex.match(Line, &Matches)) {
StringRef IncludeName = Matches[2]; StringRef IncludeName = Matches[2];
unsigned Category; unsigned Category;

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

@ -40,6 +40,25 @@ TEST_F(SortIncludesTest, BasicSorting) {
"#include \"b.h\"\n")); "#include \"b.h\"\n"));
} }
TEST_F(SortIncludesTest, SupportClangFormatOff) {
EXPECT_EQ("#include <a>\n"
"#include <b>\n"
"#include <c>\n"
"// clang-format off\n"
"#include <b>\n"
"#include <a>\n"
"#include <c>\n"
"// clang-format on\n",
sort("#include <b>\n"
"#include <a>\n"
"#include <c>\n"
"// clang-format off\n"
"#include <b>\n"
"#include <a>\n"
"#include <c>\n"
"// clang-format on\n"));
}
TEST_F(SortIncludesTest, IncludeSortingCanBeDisabled) { TEST_F(SortIncludesTest, IncludeSortingCanBeDisabled) {
Style.SortIncludes = false; Style.SortIncludes = false;
EXPECT_EQ("#include \"a.h\"\n" EXPECT_EQ("#include \"a.h\"\n"