feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++: code completion for lambda calls

Browse Source 
support for lambdas, e.g.:
struct S { int bar; };
[]() { return new S; } ()->bar;
[] { return new S; } ()->bar;
[]() ->S* { return new S(); } ()->bar;
[]() throw() { return new S(); } ()->bar;
[]() throw()->S* { return new S(); } ()->bar;

Task-number: QTCREATORBUG-9523
Change-Id: I43fbf6f0ee0bb11411c53c984df75ef33a276466
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Przemyslaw Gorszkowski
2013-06-25 15:41:17 +02:00
committed by Erik Verbruggen
parent ab15d38726
commit 46461fc183
5 changed files with 185 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/libs/cplusplus/ExpressionUnderCursor.cpp
View File

@@ -176,6 +176,30 @@ int ExpressionUnderCursor::startOfExpression_helper(BackwardsScanner &tk, int in
else if (tk[lessIndex - 1].is(T_SLOT))
return startOfExpression(tk, lessIndex);
}
} else if (tk[matchingBraceIndex - 1].is(T_RBRACE)) {
// lambda: [](){} ()
int leftBraceIndex = tk.startOfMatchingBrace(matchingBraceIndex);
if (matchingBraceIndex != leftBraceIndex) {
int currentIndex = leftBraceIndex;
while (currentIndex >= 0) {
if (tk[currentIndex-1].is(T_RPAREN)) {
int leftParenIndex = tk.startOfMatchingBrace(currentIndex);
if (tk[leftParenIndex-1].is(T_THROW)) {
currentIndex = leftParenIndex-1;
} else if (tk[leftParenIndex-1].is(T_RBRACKET)) {
int leftBracketIndex = tk.startOfMatchingBrace(leftParenIndex);
if (leftBracketIndex != leftParenIndex-1)
return leftBracketIndex;
}
} else if (tk[currentIndex-1].is(T_RBRACKET)) {
int leftBracketIndex = tk.startOfMatchingBrace(currentIndex);
if (leftBracketIndex != currentIndex-1)
return leftBracketIndex;
} else {
--currentIndex;
}
}
}
}
return startOfExpression(tk, matchingBraceIndex);
}