MyDeveloperDay created this revision.
MyDeveloperDay added reviewers: owenpan, curdeius, HazardyKnusperkeks, JohelEGP.
MyDeveloperDay added projects: clang, clang-format.
MyDeveloperDay requested review of this revision.
https://github.com/llvm/llvm-project/issues/53008
template <class Id> using A = quantity /**/<kind<Id>, 1>;
the presence of the comment between identifier and template opener seems to be
causing the qualifier alignment to fail
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D116726
Files:
clang/lib/Format/QualifierAlignmentFixer.cpp
clang/unittests/Format/QualifierFixerTest.cpp
Index: clang/unittests/Format/QualifierFixerTest.cpp
===================================================================
--- clang/unittests/Format/QualifierFixerTest.cpp
+++ clang/unittests/Format/QualifierFixerTest.cpp
@@ -818,5 +818,18 @@
EXPECT_EQ(ReplacementCount, 0);
}
+TEST_F(QualifierFixerTest, QualifierTemplates) {
+
+ FormatStyle Style = getLLVMStyle();
+ Style.QualifierAlignment = FormatStyle::QAS_Custom;
+ Style.QualifierOrder = {"static", "const", "type"};
+
+ ReplacementCount = 0;
+ EXPECT_EQ(ReplacementCount, 0);
+ verifyFormat("template <class Id> using A = quantity /**/<kind<Id>, 1>;",
+ Style);
+ EXPECT_EQ(ReplacementCount, 0);
+}
+
} // namespace format
} // namespace clang
Index: clang/lib/Format/QualifierAlignmentFixer.cpp
===================================================================
--- clang/lib/Format/QualifierAlignmentFixer.cpp
+++ clang/lib/Format/QualifierAlignmentFixer.cpp
@@ -334,7 +334,8 @@
Next->Previous->startsSequence(tok::identifier, TT_TemplateOpener)) {
// Read from to the end of the TemplateOpener to
// TemplateCloser const ArrayRef<int> a; const ArrayRef<int> &a;
- assert(Next->MatchingParen && "Missing template closer");
+ if (!Next->MatchingParen)
+ return Next;
Next = Next->MatchingParen->Next;
// Move to the end of any template class members e.g.
Index: clang/unittests/Format/QualifierFixerTest.cpp
===================================================================
--- clang/unittests/Format/QualifierFixerTest.cpp
+++ clang/unittests/Format/QualifierFixerTest.cpp
@@ -818,5 +818,18 @@
EXPECT_EQ(ReplacementCount, 0);
}
+TEST_F(QualifierFixerTest, QualifierTemplates) {
+
+ FormatStyle Style = getLLVMStyle();
+ Style.QualifierAlignment = FormatStyle::QAS_Custom;
+ Style.QualifierOrder = {"static", "const", "type"};
+
+ ReplacementCount = 0;
+ EXPECT_EQ(ReplacementCount, 0);
+ verifyFormat("template <class Id> using A = quantity /**/<kind<Id>, 1>;",
+ Style);
+ EXPECT_EQ(ReplacementCount, 0);
+}
+
} // namespace format
} // namespace clang
Index: clang/lib/Format/QualifierAlignmentFixer.cpp
===================================================================
--- clang/lib/Format/QualifierAlignmentFixer.cpp
+++ clang/lib/Format/QualifierAlignmentFixer.cpp
@@ -334,7 +334,8 @@
Next->Previous->startsSequence(tok::identifier, TT_TemplateOpener)) {
// Read from to the end of the TemplateOpener to
// TemplateCloser const ArrayRef<int> a; const ArrayRef<int> &a;
- assert(Next->MatchingParen && "Missing template closer");
+ if (!Next->MatchingParen)
+ return Next;
Next = Next->MatchingParen->Next;
// Move to the end of any template class members e.g.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
