AndWass updated this revision to Diff 222287.
AndWass added a comment.
Updated to fix test failures.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D68072/new/
https://reviews.llvm.org/D68072
Files:
clang/lib/Format/TokenAnnotator.cpp
clang/unittests/Format/FormatTest.cpp
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -14373,6 +14373,41 @@
verifyFormat("auto lambda = [&a = a]() { a = 2; };", AlignStyle);
}
+TEST_F(FormatTest, RefQualifiedTemplateMember) {
+ FormatStyle AlignStyle = getLLVMStyle();
+ AlignStyle.AlwaysBreakTemplateDeclarations = FormatStyle::BTDS_Yes;
+
+ verifyFormat("struct f {\n"
+ " template <class T>\n"
+ " int &foo() & noexcept {}\n"
+ "};",
+ AlignStyle);
+
+ verifyFormat("struct f {\n"
+ " template <class T>\n"
+ " int &foo() && noexcept {}\n"
+ "};",
+ AlignStyle);
+
+ verifyFormat("struct f {\n"
+ " template <class T>\n"
+ " int &foo() const & noexcept {}\n"
+ "};",
+ AlignStyle);
+
+ verifyFormat("struct f {\n"
+ " template <class T>\n"
+ " int &foo() const & noexcept {}\n"
+ "};",
+ AlignStyle);
+
+ verifyFormat("struct f {\n"
+ " template <class T>\n"
+ " auto foo() && noexcept -> int & {}\n"
+ "};",
+ AlignStyle);
+}
+
} // end namespace
} // end namespace format
} // end namespace clang
Index: clang/lib/Format/TokenAnnotator.cpp
===================================================================
--- clang/lib/Format/TokenAnnotator.cpp
+++ clang/lib/Format/TokenAnnotator.cpp
@@ -65,7 +65,7 @@
AnnotatingParser(const FormatStyle &Style, AnnotatedLine &Line,
const AdditionalKeywords &Keywords)
: Style(Style), Line(Line), CurrentToken(Line.First), AutoFound(false),
- Keywords(Keywords) {
+ TrailingReturnFound(false), ParenthesisDepth(0), Keywords(Keywords) {
Contexts.push_back(Context(tok::unknown, 1, /*IsExpression=*/false));
resetTokenMetadata(CurrentToken);
}
@@ -1367,6 +1367,12 @@
}
}
+ if (Current.is(tok::l_paren)) {
+ ParenthesisDepth++;
+ } else if (Current.is(tok::r_paren)) {
+ ParenthesisDepth--;
+ }
+
// Line.MightBeFunctionDecl can only be true after the parentheses of a
// function declaration have been found. In this case, 'Current' is a
// trailing token of this declaration and thus cannot be a name.
@@ -1389,7 +1395,11 @@
} else if (Current.is(tok::arrow) && AutoFound && Line.MustBeDeclaration &&
Current.NestingLevel == 0) {
Current.Type = TT_TrailingReturnArrow;
- } else if (Current.isOneOf(tok::star, tok::amp, tok::ampamp)) {
+ TrailingReturnFound = true;
+ } else if (Current.is(tok::star) ||
+ (Current.isOneOf(tok::amp, tok::ampamp) &&
+ (ParenthesisDepth != 0 || !Line.MightBeFunctionDecl ||
+ TrailingReturnFound))) {
Current.Type = determineStarAmpUsage(Current,
Contexts.back().CanBeExpression &&
Contexts.back().IsExpression,
@@ -1412,6 +1422,8 @@
Current.Type = TT_ConditionalExpr;
}
} else if (Current.isBinaryOperator() &&
+ !(Line.MightBeFunctionDecl && ParenthesisDepth == 0 &&
+ Current.isOneOf(tok::amp, tok::ampamp)) &&
(!Current.Previous || Current.Previous->isNot(tok::l_square)) &&
(!Current.is(tok::greater) &&
Style.Language != FormatStyle::LK_TextProto)) {
@@ -1486,10 +1498,12 @@
// colon after this, this is the only place which annotates the identifier
// as a selector.)
Current.Type = TT_SelectorName;
- } else if (Current.isOneOf(tok::identifier, tok::kw_const) &&
+ } else if (Current.isOneOf(tok::identifier, tok::kw_const, tok::amp,
+ tok::ampamp) &&
Current.Previous &&
!Current.Previous->isOneOf(tok::equal, tok::at) &&
- Line.MightBeFunctionDecl && Contexts.size() == 1) {
+ Line.MightBeFunctionDecl && !TrailingReturnFound &&
+ Contexts.size() == 1 && ParenthesisDepth == 0) {
// Line.MightBeFunctionDecl can only be true after the parentheses of a
// function declaration have been found.
Current.Type = TT_TrailingAnnotation;
@@ -1767,6 +1781,8 @@
AnnotatedLine &Line;
FormatToken *CurrentToken;
bool AutoFound;
+ bool TrailingReturnFound;
+ int ParenthesisDepth;
const AdditionalKeywords &Keywords;
// Set of "<" tokens that do not open a template parameter list. If parseAngle
@@ -2680,6 +2696,11 @@
Right.MatchingParen->endsSequence(TT_DictLiteral, tok::at))
// Objective-C dictionary literal -> no space before closing brace.
return false;
+ if (Right.Type == TT_TrailingAnnotation &&
+ Right.isOneOf(tok::amp, tok::ampamp) &&
+ Left.isOneOf(tok::kw_const, tok::kw_volatile) &&
+ (!Right.Next || Right.Next->is(tok::semi)))
+ return Style.PointerAlignment != FormatStyle::PAS_Left;
return true;
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
