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

clang-format: Extend main header include sorting heuristic to Objective-C files. 

llvm-svn: 250675
This commit is contained in:
Nico Weber 2015-10-19 01:36:09 +00:00
parent 7f66d75832
commit afa62fae1e
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1747,7 +1747,9 @@ tooling::Replacements sortIncludes(const FormatStyle &Style, StringRef Code,
FileName.endswith(".cc") ||
FileName.endswith(".cpp")||
FileName.endswith(".c++")||
FileName.endswith(".cxx");
FileName.endswith(".cxx") ||
FileName.endswith(".m")||
FileName.endswith(".mm");
// Create pre-compiled regular expressions for the #include categories.
SmallVector<llvm::Regex, 4> CategoryRegexs;

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

@ -122,6 +122,13 @@ TEST_F(SortIncludesTest, LeavesMainHeaderFirst) {
sort("#include \"llvm/a.h\"\n"
"#include \"c.h\"\n"
"#include \"b.h\"\n"));
EXPECT_EQ("#include \"llvm/a.h\"\n"
"#include \"b.h\"\n"
"#include \"c.h\"\n",
sort("#include \"llvm/a.h\"\n"
"#include \"c.h\"\n"
"#include \"b.h\"\n",
"input.mm"));
// Don't do this in headers.
EXPECT_EQ("#include \"b.h\"\n"