kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Help clang-format wrap after braces on long initializer lists 

Add a long comment inside a few braced initializer lists in order to
convince clang-format to break after the opening brace and format the
list without indenting every value past the opening brace.
This commit is contained in:
Brad King 2016-05-06 15:21:30 -04:00
parent 85425a3e6c
commit afca373510
6 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/CMakeCompilerABI.h
View File

@ -6,7 +6,9 @@ const char info_sizeof_dptr[] = {
'I', 'N', 'F', 'O', ':', 's', 'i', 'z', 'e', 'o', 'f', '_', 'd', 'p', 't', 'r', '[', 'I', 'N', 'F', 'O', ':', 's', 'i', 'z', 'e', 'o', 'f', '_', 'd', 'p', 't', 'r', '[',
('0' + ((SIZEOF_DPTR / 10)%10)), ('0' + ((SIZEOF_DPTR / 10)%10)),
('0' + (SIZEOF_DPTR % 10)), ('0' + (SIZEOF_DPTR % 10)),
']','\0'}; ']','\0'
/* clang-format needs this comment to break after the opening brace */
};
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/

1
Source/CPack/WiX/cmWIXAccessControlList.cxx
View File

@ -96,6 +96,7 @@ bool cmWIXAccessControlList::IsBooleanAttribute(std::string const& name)
{ {
static const char* validAttributes[] = static const char* validAttributes[] =
{ {
/* clang-format needs this comment to break after the opening brace */
"Append", "Append",
"ChangePermission", "ChangePermission",
"CreateChild", "CreateChild",

1
Source/cmTarget.cxx
View File

@ -167,6 +167,7 @@ void cmTarget::SetMakefile(cmMakefile* mf)
if (this->GetType() != cmState::UTILITY) if (this->GetType() != cmState::UTILITY)
{ {
const char* configProps[] = { const char* configProps[] = {
/* clang-format needs this comment to break after the opening brace */
"ARCHIVE_OUTPUT_DIRECTORY_", "ARCHIVE_OUTPUT_DIRECTORY_",
"LIBRARY_OUTPUT_DIRECTORY_", "LIBRARY_OUTPUT_DIRECTORY_",
"RUNTIME_OUTPUT_DIRECTORY_", "RUNTIME_OUTPUT_DIRECTORY_",

1
Source/cmXCodeObject.cxx
View File

@ -17,6 +17,7 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
const char* cmXCodeObject::PBXTypeNames[] = { const char* cmXCodeObject::PBXTypeNames[] = {
/* clang-format needs this comment to break after the opening brace */
"PBXGroup", "PBXBuildStyle", "PBXProject", "PBXHeadersBuildPhase", "PBXGroup", "PBXBuildStyle", "PBXProject", "PBXHeadersBuildPhase",
"PBXSourcesBuildPhase", "PBXFrameworksBuildPhase", "PBXNativeTarget", "PBXSourcesBuildPhase", "PBXFrameworksBuildPhase", "PBXNativeTarget",
"PBXFileReference", "PBXBuildFile", "PBXContainerItemProxy", "PBXFileReference", "PBXBuildFile", "PBXContainerItemProxy",

1
Source/cmake.cxx
View File

@ -1431,6 +1431,7 @@ int cmake::ActualConfigure()
const char* GeneratorName; const char* GeneratorName;
}; };
VSRegistryEntryName version[] = { VSRegistryEntryName version[] = {
/* clang-format needs this comment to break after the opening brace */
{"7.1", "Visual Studio 7 .NET 2003"}, {"7.1", "Visual Studio 7 .NET 2003"},
{"8.0", "Visual Studio 8 2005"}, {"8.0", "Visual Studio 8 2005"},
{"9.0", "Visual Studio 9 2008"}, {"9.0", "Visual Studio 9 2008"},

2
Tests/CMakeLib/testVisualStudioSlnParser.cxx
View File

@ -69,6 +69,7 @@ int testVisualStudioSlnParser(int, char*[])
"cmsysTestsCxx", "cmsys_c", "cmw9xcom", "cmzlib", "cpack", "ctest", "cmsysTestsCxx", "cmsys_c", "cmw9xcom", "cmzlib", "cpack", "ctest",
"documentation", "memcheck_fail", "pseudo_BC", "pseudo_purify", "documentation", "memcheck_fail", "pseudo_BC", "pseudo_purify",
"pseudo_valgrind", "test_clean", "uninstall" "pseudo_valgrind", "test_clean", "uninstall"
/* clang-format needs this comment to break after the opening brace */
}; };
const size_t expectedProjectCount = sizeof(names) / sizeof(*names); const size_t expectedProjectCount = sizeof(names) / sizeof(*names);
if (projects.size() != expectedProjectCount) if (projects.size() != expectedProjectCount)
@ -160,6 +161,7 @@ int testVisualStudioSlnParser(int, char*[])
{ {
"header", "projectArgs", "topLevel", "projectContents", "projectSection", "header", "projectArgs", "topLevel", "projectContents", "projectSection",
"global", "unclosed", "strayQuote", "strayParen", "strayQuote2" "global", "unclosed", "strayQuote", "strayParen", "strayQuote2"
/* clang-format needs this comment to break after the opening brace */
}; };
for (size_t idx = 0; idx < sizeof(files) / sizeof(files[0]); ++idx) for (size_t idx = 0; idx < sizeof(files) / sizeof(files[0]); ++idx)
{ {