mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-19 05:46:45 +00:00
Code Issues Projects Releases Wiki Activity

[clang-format] Don't sort qualifiers across preprocessor directives (#81958)

Browse Source 
Fixes #80579.
This commit is contained in:
Owen Pan 2024-02-16 23:19:31 -08:00 committed by GitHub
parent 3da0166331
commit ea16a3bb4c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Format/QualifierAlignmentFixer.cpp
View File

@ -561,6 +561,8 @@ void LeftRightQualifierAlignmentFixer::fixQualifierAlignment(
for (const auto *Tok = First; Tok && Tok != Last && Tok->Next;
Tok = Tok->Next) {
if (Tok->MustBreakBefore)
break;
if (Tok->is(tok::comment))
continue;
if (RightAlign) {

13
clang/unittests/Format/QualifierFixerTest.cpp
View File

@ -1177,6 +1177,19 @@ TEST_F(QualifierFixerTest, DontPushQualifierThroughNonSpecifiedTypes) {
verifyFormat("const inline static Foo;", Style);
}
TEST_F(QualifierFixerTest, QualifiersBrokenUpByPPDirectives) {
auto Style = getLLVMStyle();
Style.QualifierAlignment = FormatStyle::QAS_Custom;
Style.QualifierOrder = {"constexpr", "inline", "type"};
verifyFormat("inline\n"
"#if FOO\n"
" constexpr\n"
"#endif\n"
" int i = 0;",
Style);
}
TEST_F(QualifierFixerTest, UnsignedQualifier) {
FormatStyle Style = getLLVMStyle();