MyDeveloperDay updated this revision to Diff 397853.
MyDeveloperDay marked 3 inline comments as done.
MyDeveloperDay added a comment.
Use getNextNonComment() which has some const-ness knock ons (but probably not a
bad thing)
address the review concerns by adding more tests (which indeed highlighted new
failure scenarios! Thanks @curdeius)
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D116726/new/
https://reviews.llvm.org/D116726
Files:
clang/lib/Format/QualifierAlignmentFixer.cpp
clang/lib/Format/QualifierAlignmentFixer.h
clang/unittests/Format/QualifierFixerTest.cpp
Index: clang/unittests/Format/QualifierFixerTest.cpp
===================================================================
--- clang/unittests/Format/QualifierFixerTest.cpp
+++ clang/unittests/Format/QualifierFixerTest.cpp
@@ -818,5 +818,53 @@
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);
+ verifyFormat("template <class Id> using A = quantity /**/<kind<Id>, 1>;",
+ Style);
+ verifyFormat("template <class Id> using A = quantity /* */<kind<Id>, 1>;",
+ Style);
+ verifyFormat("template <class Id> using A = quantity /*foo*/<kind<Id>, 1>;",
+ Style);
+ verifyFormat("template <class Id> using A = quantity /**/ /**/<kind<Id>, 1>;",
+ Style);
+ verifyFormat("template <class Id> using A = quantity<kind</**/ Id>, 1>;",
+ Style);
+ verifyFormat("template <class Id> using A = /**/ quantity<kind<Id>, 1>;",
+ Style);
+ EXPECT_EQ(ReplacementCount, 0);
+ verifyFormat("template <class Id>\n"
+ "using A = quantity // foo\n"
+ " <kind<Id>, 1>;",
+ Style);
+
+ ReplacementCount = 0;
+ Style.QualifierOrder = {"type", "static", "const"};
+ verifyFormat("template <class Id> using A = quantity<kind<Id>, 1>;", Style);
+ verifyFormat("template <class Id> using A = quantity /**/<kind<Id>, 1>;",
+ Style);
+ verifyFormat("template <class Id> using A = quantity /* */<kind<Id>, 1>;",
+ Style);
+ verifyFormat("template <class Id> using A = quantity /*foo*/<kind<Id>, 1>;",
+ Style);
+ verifyFormat("template <class Id> using A = quantity /**/ /**/<kind<Id>, 1>;",
+ Style);
+ verifyFormat("template <class Id> using A = quantity<kind</**/ Id>, 1>;",
+ Style);
+ verifyFormat("template <class Id> using A = /**/ quantity<kind<Id>, 1>;",
+ Style);
+ EXPECT_EQ(ReplacementCount, 0);
+ verifyFormat("template <class Id>\n"
+ "using A = quantity // foo\n"
+ " <kind<Id>, 1>;",
+ Style);
+}
+
} // namespace format
} // namespace clang
Index: clang/lib/Format/QualifierAlignmentFixer.h
===================================================================
--- clang/lib/Format/QualifierAlignmentFixer.h
+++ clang/lib/Format/QualifierAlignmentFixer.h
@@ -72,17 +72,19 @@
static tok::TokenKind getTokenFromQualifier(const std::string &Qualifier);
- FormatToken *analyzeRight(const SourceManager &SourceMgr,
- const AdditionalKeywords &Keywords,
- tooling::Replacements &Fixes, FormatToken *Tok,
- const std::string &Qualifier,
- tok::TokenKind QualifierType);
-
- FormatToken *analyzeLeft(const SourceManager &SourceMgr,
- const AdditionalKeywords &Keywords,
- tooling::Replacements &Fixes, FormatToken *Tok,
- const std::string &Qualifier,
- tok::TokenKind QualifierType);
+ const FormatToken *analyzeRight(const SourceManager &SourceMgr,
+ const AdditionalKeywords &Keywords,
+ tooling::Replacements &Fixes,
+ const FormatToken *Tok,
+ const std::string &Qualifier,
+ tok::TokenKind QualifierType);
+
+ const FormatToken *analyzeLeft(const SourceManager &SourceMgr,
+ const AdditionalKeywords &Keywords,
+ tooling::Replacements &Fixes,
+ const FormatToken *Tok,
+ const std::string &Qualifier,
+ tok::TokenKind QualifierType);
// is the Token a simple or qualifier type
static bool isQualifierOrType(const FormatToken *Tok,
Index: clang/lib/Format/QualifierAlignmentFixer.cpp
===================================================================
--- clang/lib/Format/QualifierAlignmentFixer.cpp
+++ clang/lib/Format/QualifierAlignmentFixer.cpp
@@ -204,9 +204,9 @@
replaceToken(SourceMgr, Fixes, Range, NewText);
}
-FormatToken *LeftRightQualifierAlignmentFixer::analyzeRight(
+const FormatToken *LeftRightQualifierAlignmentFixer::analyzeRight(
const SourceManager &SourceMgr, const AdditionalKeywords &Keywords,
- tooling::Replacements &Fixes, FormatToken *Tok,
+ tooling::Replacements &Fixes, const FormatToken *Tok,
const std::string &Qualifier, tok::TokenKind QualifierType) {
// We only need to think about streams that begin with a qualifier.
if (!Tok->is(QualifierType))
@@ -281,16 +281,16 @@
return Tok;
}
-FormatToken *LeftRightQualifierAlignmentFixer::analyzeLeft(
+const FormatToken *LeftRightQualifierAlignmentFixer::analyzeLeft(
const SourceManager &SourceMgr, const AdditionalKeywords &Keywords,
- tooling::Replacements &Fixes, FormatToken *Tok,
+ tooling::Replacements &Fixes, const FormatToken *Tok,
const std::string &Qualifier, tok::TokenKind QualifierType) {
// if Tok is an identifier and possibly a macro then don't convert.
if (LeftRightQualifierAlignmentFixer::isPossibleMacro(Tok))
return Tok;
- FormatToken *Qual = Tok;
- FormatToken *LastQual = Qual;
+ const FormatToken *Qual = Tok;
+ const FormatToken *LastQual = Qual;
while (Qual && isQualifierOrType(Qual, ConfiguredQualifierTokens)) {
LastQual = Qual;
Qual = Qual->Next;
@@ -326,7 +326,7 @@
Tok->Previous->isOneOf(tok::star, tok::ampamp, tok::amp)) {
return Tok;
}
- FormatToken *Next = Tok->Next;
+ const FormatToken *Next = Tok->Next;
// The case `std::Foo<T> const` -> `const std::Foo<T> &&`
while (Next && Next->isOneOf(tok::identifier, tok::coloncolon))
Next = Next->Next;
@@ -334,6 +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;
+ if (Next->is(tok::comment) && Next->getNextNonComment())
+ Next = Next->getNextNonComment();
assert(Next->MatchingParen && "Missing template closer");
Next = Next->MatchingParen->Next;
@@ -398,7 +400,8 @@
FormatToken *First = AnnotatedLines[I]->First;
const auto *Last = AnnotatedLines[I]->Last;
- for (auto *Tok = First; Tok && Tok != Last && Tok->Next; Tok = Tok->Next) {
+ for (const auto *Tok = First; Tok && Tok != Last && Tok->Next;
+ Tok = Tok->Next) {
if (Tok->is(tok::comment))
continue;
if (RightAlign)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
