Author: Rafał Jelonek Date: 2021-01-11T09:49:34+01:00 New Revision: 89878e8c966a82ed6b7f0254700017f0a97fb7d7
URL: https://github.com/llvm/llvm-project/commit/89878e8c966a82ed6b7f0254700017f0a97fb7d7 DIFF: https://github.com/llvm/llvm-project/commit/89878e8c966a82ed6b7f0254700017f0a97fb7d7.diff LOG: [clang-format] Find main include after block ended with #pragma hdrstop Find main include in first include block not ended with #pragma hdrstop Reviewed By: curdeius Differential Revision: https://reviews.llvm.org/D94217 Added: Modified: clang/lib/Format/Format.cpp clang/unittests/Format/SortIncludesTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index 37b6c4c8a20e..fc62a3419d48 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -2308,7 +2308,10 @@ tooling::Replacements sortCppIncludes(const FormatStyle &Style, StringRef Code, sortCppIncludes(Style, IncludesInBlock, Ranges, FileName, Code, Replaces, Cursor); IncludesInBlock.clear(); - FirstIncludeBlock = false; + if (Trimmed.startswith("#pragma hdrstop")) // Precompiled headers. + FirstIncludeBlock = true; + else + FirstIncludeBlock = false; } } if (Pos == StringRef::npos || Pos + 1 == Code.size()) diff --git a/clang/unittests/Format/SortIncludesTest.cpp b/clang/unittests/Format/SortIncludesTest.cpp index f2f0e9391ece..41ff7afad10e 100644 --- a/clang/unittests/Format/SortIncludesTest.cpp +++ b/clang/unittests/Format/SortIncludesTest.cpp @@ -900,6 +900,45 @@ TEST_F(SortIncludesTest, DoNotRegroupGroupsInGoogleObjCStyle) { "#include \"a.h\"")); } +TEST_F(SortIncludesTest, DoNotTreatPrecompiledHeadersAsFirstBlock) { + Style.IncludeBlocks = Style.IBS_Merge; + std::string Code = "#include \"d.h\"\r\n" + "#include \"b.h\"\r\n" + "#pragma hdrstop\r\n" + "\r\n" + "#include \"c.h\"\r\n" + "#include \"a.h\"\r\n" + "#include \"e.h\"\r\n"; + + std::string Expected = "#include \"b.h\"\r\n" + "#include \"d.h\"\r\n" + "#pragma hdrstop\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", 2)); + + Code = "#include \"d.h\"\n" + "#include \"b.h\"\n" + "#pragma hdrstop( \"c:\\projects\\include\\myinc.pch\" )\n" + "\n" + "#include \"c.h\"\n" + "#include \"a.h\"\n" + "#include \"e.h\"\n"; + + Expected = "#include \"b.h\"\n" + "#include \"d.h\"\n" + "#pragma hdrstop(\"c:\\projects\\include\\myinc.pch\")\n" + "\n" + "#include \"e.h\"\n" + "#include \"a.h\"\n" + "#include \"c.h\"\n"; + + EXPECT_EQ(Expected, sort(Code, "e.cpp", 2)); +} + TEST_F(SortIncludesTest, skipUTF8ByteOrderMarkMerge) { Style.IncludeBlocks = Style.IBS_Merge; std::string Code = "\xEF\xBB\xBF#include \"d.h\"\r\n" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
