This is an archive of the discontinued LLVM Phabricator instance.

Differential D66653

[clang-format] Turn include regrouping on for Google ObjC style
AbandonedPublic

Authored by krasimir on Aug 23 2019, 7:21 AM.

Details

Reviewers
thakis
Summary

Turns back include regrouping for Google ObjC style

Diff Detail

Event Timeline

krasimir created this revision.Aug 23 2019, 7:21 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 23 2019, 7:21 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B37186: Diff 216843.Aug 23 2019, 7:21 AM
thakis accepted this revision.Aug 23 2019, 7:22 AM
thakis added a subscriber: thakis.

Thanks!

This revision is now accepted and ready to land.Aug 23 2019, 7:22 AM
krasimir abandoned this revision.Sep 13 2019, 2:09 AM

This was for experimental purposes, abandoning.

Revision Contents

PathSize
lib/
Format/
5 lines
unittests/
Format/
12 lines

Diff 216843

lib/Format/Format.cpp

Show First 20 Lines • Show All 892 Lines • ▼ Show 20 Lines if (Language == FormatStyle::LK_Java) {
// Text protos are currently mostly formatted inside C++ raw string literals // Text protos are currently mostly formatted inside C++ raw string literals
// and often the current breaking behavior of string literals is not // and often the current breaking behavior of string literals is not
// beneficial there. Investigate turning this on once proper string reflow // beneficial there. Investigate turning this on once proper string reflow
// has been implemented. // has been implemented.
GoogleStyle.BreakStringLiterals = false; GoogleStyle.BreakStringLiterals = false;
} else if (Language == FormatStyle::LK_ObjC) { } else if (Language == FormatStyle::LK_ObjC) {
GoogleStyle.AlwaysBreakBeforeMultilineStrings = false; GoogleStyle.AlwaysBreakBeforeMultilineStrings = false;
GoogleStyle.ColumnLimit = 100; GoogleStyle.ColumnLimit = 100;
// "Regroup" doesn't work well for ObjC yet (main header heuristic,
// relationship between ObjC standard library headers and other heades,
// #imports, etc.)
GoogleStyle.IncludeStyle.IncludeBlocks =
tooling::IncludeStyle::IBS_Preserve;
} }
return GoogleStyle; return GoogleStyle;
} }
FormatStyle getChromiumStyle(FormatStyle::LanguageKind Language) { FormatStyle getChromiumStyle(FormatStyle::LanguageKind Language) {
FormatStyle ChromiumStyle = getGoogleStyle(Language); FormatStyle ChromiumStyle = getGoogleStyle(Language);
▲ Show 20 Lines • Show All 1,652 Lines • Show Last 20 Lines

unittests/Format/SortIncludesTest.cpp

Show First 20 Lines • Show All 647 Lines • ▼ Show 20 LinesTEST_F(SortIncludesTest, DoNotOutputReplacementsForSortedBlocksWithRegrouping) {
std::string Code = R"( std::string Code = R"(
#include "b.h" #include "b.h"
#include <a.h> #include <a.h>
)"; )";
EXPECT_EQ(Code, sort(Code, "input.h", 0)); EXPECT_EQ(Code, sort(Code, "input.h", 0));
} }
TEST_F(SortIncludesTest, DoNotRegroupGroupsInGoogleObjCStyle) {
FmtStyle = getGoogleStyle(FormatStyle::LK_ObjC);
EXPECT_EQ("#include <a.h>\n"
"#include <b.h>\n"
"#include \"a.h\"",
sort("#include <b.h>\n"
"#include <a.h>\n"
"#include \"a.h\""));
}
} // end namespace } // end namespace
} // end namespace format } // end namespace format
} // end namespace clang } // end namespace clang