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

Fixed scope completion after a template-id. For example, when completing std::list<int>::i...

Browse Source
This commit is contained in:
Roberto Raggi
2009-12-07 15:31:46 +01:00
parent 44f29afc6b
commit 55175c149c
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,13 @@ ExpressionUnderCursor::~ExpressionUnderCursor()
int ExpressionUnderCursor::startOfExpression(BackwardsScanner &tk, int index)
{
if (tk[index - 1].is(T_GREATER)) {
const int matchingBraceIndex = tk.startOfMatchingBrace(index);
if (tk[matchingBraceIndex - 1].is(T_IDENTIFIER))
index = matchingBraceIndex - 1;
}
index = startOfExpression_helper(tk, index);
if (_jumpedComma) {
@@ -148,11 +155,11 @@ int ExpressionUnderCursor::startOfExpression_helper(BackwardsScanner &tk, int in
}
return index - 1;
} else if (tk[index - 1].is(T_RPAREN)) {
int rparenIndex = tk.startOfMatchingBrace(index);
if (rparenIndex != index) {
if (tk[rparenIndex - 1].is(T_GREATER)) {
int lessIndex = tk.startOfMatchingBrace(rparenIndex);
if (lessIndex != rparenIndex - 1) {
int matchingBraceIndex = tk.startOfMatchingBrace(index);
if (matchingBraceIndex != index) {
if (tk[matchingBraceIndex - 1].is(T_GREATER)) {
int lessIndex = tk.startOfMatchingBrace(matchingBraceIndex);
if (lessIndex != matchingBraceIndex - 1) {
if (tk[lessIndex - 1].is(T_DYNAMIC_CAST) ||
tk[lessIndex - 1].is(T_STATIC_CAST) ||
tk[lessIndex - 1].is(T_CONST_CAST) ||
@@ -166,7 +173,7 @@ int ExpressionUnderCursor::startOfExpression_helper(BackwardsScanner &tk, int in
return startOfExpression(tk, lessIndex);
}
}
return startOfExpression(tk, rparenIndex);
return startOfExpression(tk, matchingBraceIndex);
}
return index;
} else if (tk[index - 1].is(T_RBRACKET)) {