Author: Owen Pan Date: 2024-02-16T23:19:31-08:00 New Revision: ea16a3bb4ce4010e3e15fddaad03df66f99548c6
URL: https://github.com/llvm/llvm-project/commit/ea16a3bb4ce4010e3e15fddaad03df66f99548c6 DIFF: https://github.com/llvm/llvm-project/commit/ea16a3bb4ce4010e3e15fddaad03df66f99548c6.diff LOG: [clang-format] Don't sort qualifiers across preprocessor directives (#81958) Fixes #80579. Added: Modified: clang/lib/Format/QualifierAlignmentFixer.cpp clang/unittests/Format/QualifierFixerTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/QualifierAlignmentFixer.cpp b/clang/lib/Format/QualifierAlignmentFixer.cpp index 84941746f0df71..0c63d330b5aed4 100644 --- a/clang/lib/Format/QualifierAlignmentFixer.cpp +++ b/clang/lib/Format/QualifierAlignmentFixer.cpp @@ -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) { diff --git a/clang/unittests/Format/QualifierFixerTest.cpp b/clang/unittests/Format/QualifierFixerTest.cpp index 0aa755acfc8213..43476aea66337b 100644 --- a/clang/unittests/Format/QualifierFixerTest.cpp +++ b/clang/unittests/Format/QualifierFixerTest.cpp @@ -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(); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
