maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert r373056: [clang-format] Reference qualifiers in member templates causing extra indentation 

Reason: this breaks unit tests.
llvm-svn: 373059
This commit is contained in:
Ilya Biryukov 2019-09-27 09:49:20 +00:00
parent b8cf059fac
commit 4627bdedd9
2 changed files with 4 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clang/lib/Format/TokenAnnotator.cpp
View File

@ -65,7 +65,7 @@ public:
AnnotatingParser(const FormatStyle &Style, AnnotatedLine &Line,
const AdditionalKeywords &Keywords)
: Style(Style), Line(Line), CurrentToken(Line.First), AutoFound(false),
TrailingReturnFound(false), Keywords(Keywords) {
Keywords(Keywords) {
Contexts.push_back(Context(tok::unknown, 1, /*IsExpression=*/false));
resetTokenMetadata(CurrentToken);
}
@ -1389,10 +1389,7 @@ private:
} else if (Current.is(tok::arrow) && AutoFound && Line.MustBeDeclaration &&
Current.NestingLevel == 0) {
Current.Type = TT_TrailingReturnArrow;
TrailingReturnFound = true;
} else if (Current.is(tok::star) ||
(Current.isOneOf(tok::amp, tok::ampamp) &&
(!Line.MightBeFunctionDecl || TrailingReturnFound))) {
} else if (Current.isOneOf(tok::star, tok::amp, tok::ampamp)) {
Current.Type = determineStarAmpUsage(Current,
Contexts.back().CanBeExpression &&
Contexts.back().IsExpression,
@ -1415,8 +1412,6 @@ private:
Current.Type = TT_ConditionalExpr;
}
} else if (Current.isBinaryOperator() &&
!(Line.MightBeFunctionDecl &&
Current.isOneOf(tok::amp, tok::ampamp)) &&
(!Current.Previous || Current.Previous->isNot(tok::l_square)) &&
(!Current.is(tok::greater) &&
Style.Language != FormatStyle::LK_TextProto)) {
@ -1491,12 +1486,10 @@ private:
// 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, tok::amp,
tok::ampamp) &&
} else if (Current.isOneOf(tok::identifier, tok::kw_const) &&
Current.Previous &&
!Current.Previous->isOneOf(tok::equal, tok::at) &&
Line.MightBeFunctionDecl && !TrailingReturnFound &&
Contexts.size() == 1) {
Line.MightBeFunctionDecl && Contexts.size() == 1) {
// Line.MightBeFunctionDecl can only be true after the parentheses of a
// function declaration have been found.
Current.Type = TT_TrailingAnnotation;
@ -1774,7 +1767,6 @@ private:
AnnotatedLine &Line;
FormatToken *CurrentToken;
bool AutoFound;
bool TrailingReturnFound;
const AdditionalKeywords &Keywords;
// Set of "<" tokens that do not open a template parameter list. If parseAngle

35
clang/unittests/Format/FormatTest.cpp
View File

@ -14373,41 +14373,6 @@ TEST_F(FormatTest, AmbersandInLamda) {
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