diff options
| -rw-r--r-- | clang/lib/Format/QualifierAlignmentFixer.cpp | 2 | ||||
| -rw-r--r-- | clang/unittests/Format/QualifierFixerTest.cpp | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/clang/lib/Format/QualifierAlignmentFixer.cpp b/clang/lib/Format/QualifierAlignmentFixer.cpp index 8494174..0c63d33 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 0aa755a..43476ae 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(); |