clang-format: Fix parsing and indenting lambdas.
Before:
void f() {
other(x.begin(), x.end(), //
[&](int, int) { return 1; });
}
After:
void f() {
other(x.begin(), x.end(), //
[&](int, int) { return 1; });
}
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@190039 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Format/ContinuationIndenter.cpp b/lib/Format/ContinuationIndenter.cpp
index f9219cb..c47d799 100644
--- a/lib/Format/ContinuationIndenter.cpp
+++ b/lib/Format/ContinuationIndenter.cpp
@@ -267,7 +267,8 @@
State.Column = State.Stack.back().Indent;
State.Stack.back().ColonPos = State.Column + Current.CodePointCount;
}
- } else if (Current.is(tok::l_square) && Current.Type != TT_ObjCMethodExpr) {
+ } else if (Current.is(tok::l_square) && Current.Type != TT_ObjCMethodExpr &&
+ Current.Type != TT_LambdaLSquare) {
if (State.Stack.back().StartOfArraySubscripts != 0)
State.Column = State.Stack.back().StartOfArraySubscripts;
else
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index 9e17ee9..46baab4 100644
--- a/lib/Format/TokenAnnotator.cpp
+++ b/lib/Format/TokenAnnotator.cpp
@@ -201,7 +201,8 @@
while (CurrentToken != NULL) {
if (CurrentToken->is(tok::r_square)) {
- if (CurrentToken->Next && CurrentToken->Next->is(tok::l_paren)) {
+ if (CurrentToken->Next && CurrentToken->Next->is(tok::l_paren) &&
+ Left->Type == TT_ObjCMethodExpr) {
// An ObjC method call is rarely followed by an open parenthesis.
// FIXME: Do we incorrectly label ":" with this?
StartsObjCMethodExpr = false;
diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp
index 4e70625..13b9847 100644
--- a/lib/Format/UnwrappedLineParser.cpp
+++ b/lib/Format/UnwrappedLineParser.cpp
@@ -676,27 +676,22 @@
void UnwrappedLineParser::tryToParseLambda() {
assert(FormatTok->is(tok::l_square));
FormatToken &LSquare = *FormatTok;
- if (!tryToParseLambdaIntroducer()) {
+ if (!tryToParseLambdaIntroducer())
return;
- }
- if (FormatTok->is(tok::l_paren)) {
- parseParens();
- }
while (FormatTok->isNot(tok::l_brace)) {
switch (FormatTok->Tok.getKind()) {
- case tok::l_brace:
- break;
- case tok::l_paren:
- parseParens();
- break;
- case tok::semi:
- case tok::equal:
- case tok::eof:
- return;
- default:
- nextToken();
- break;
+ case tok::l_brace:
+ break;
+ case tok::l_paren:
+ parseParens();
+ break;
+ case tok::identifier:
+ case tok::kw_mutable:
+ nextToken();
+ break;
+ default:
+ return;
}
}
LSquare.Type = TT_LambdaLSquare;
@@ -707,23 +702,33 @@
nextToken();
if (FormatTok->is(tok::equal)) {
nextToken();
- if (FormatTok->is(tok::r_square)) return true;
- if (FormatTok->isNot(tok::comma)) return false;
+ if (FormatTok->is(tok::r_square)) {
+ nextToken();
+ return true;
+ }
+ if (FormatTok->isNot(tok::comma))
+ return false;
nextToken();
} else if (FormatTok->is(tok::amp)) {
nextToken();
- if (FormatTok->is(tok::r_square)) return true;
+ if (FormatTok->is(tok::r_square)) {
+ nextToken();
+ return true;
+ }
if (!FormatTok->isOneOf(tok::comma, tok::identifier)) {
return false;
}
- if (FormatTok->is(tok::comma)) nextToken();
+ if (FormatTok->is(tok::comma))
+ nextToken();
} else if (FormatTok->is(tok::r_square)) {
nextToken();
return true;
}
do {
- if (FormatTok->is(tok::amp)) nextToken();
- if (!FormatTok->isOneOf(tok::identifier, tok::kw_this)) return false;
+ if (FormatTok->is(tok::amp))
+ nextToken();
+ if (!FormatTok->isOneOf(tok::identifier, tok::kw_this))
+ return false;
nextToken();
if (FormatTok->is(tok::comma)) {
nextToken();
@@ -836,6 +841,9 @@
case tok::r_brace:
// A "}" inside parenthesis is an error if there wasn't a matching "{".
return;
+ case tok::l_square:
+ tryToParseLambda();
+ break;
case tok::l_brace: {
if (!tryToParseBracedList()) {
parseChildBlock();
@@ -1195,7 +1203,7 @@
for (std::list<UnwrappedLineNode>::const_iterator I = Line.Tokens.begin(),
E = Line.Tokens.end();
I != E; ++I) {
- llvm::dbgs() << I->Tok->Tok.getName() << " ";
+ llvm::dbgs() << I->Tok->Tok.getName() << "[" << I->Tok->Type << "] ";
}
for (std::list<UnwrappedLineNode>::const_iterator I = Line.Tokens.begin(),
E = Line.Tokens.end();