Skip to content

Commit eee536d

Browse files
committed
[clang-format] Don't format qualifiers in PPDirective
Fixes #54513 Differential Revision: https://reviews.llvm.org/D122548
1 parent d394f9f commit eee536d

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

clang/lib/Format/QualifierAlignmentFixer.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,8 @@ LeftRightQualifierAlignmentFixer::analyze(
407407
assert(QualifierToken != tok::identifier && "Unrecognised Qualifier");
408408

409409
for (AnnotatedLine *Line : AnnotatedLines) {
410+
if (Line->InPPDirective)
411+
continue;
410412
FormatToken *First = Line->First;
411413
assert(First);
412414
if (First->Finalized)

clang/unittests/Format/QualifierFixerTest.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -815,6 +815,7 @@ TEST_F(QualifierFixerTest, NoOpQualifierReplacements) {
815815
ReplacementCount = 0;
816816
EXPECT_EQ(ReplacementCount, 0);
817817
verifyFormat("static const uint32 foo[] = {0, 31};", Style);
818+
verifyFormat("#define MACRO static const", Style);
818819
EXPECT_EQ(ReplacementCount, 0);
819820
}
820821

0 commit comments

Comments
 (0)