diff options
author | Przemyslaw Gorszkowski <pgorszkowski@gmail.com> | 2012-12-05 09:20:52 +0100 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2012-12-06 10:57:35 +0100 |
commit | 31ce303ee71214d40fdd714fdc287f3772e8474e (patch) | |
tree | 8b0d51ff43669e612eea1b6845f86ff9ce3787c1 /src/libs/cplusplus/ExpressionUnderCursor.cpp | |
parent | d9571f2ecd5678856c91467fb02f2aaaae1fa772 (diff) | |
download | qt-creator-31ce303ee71214d40fdd714fdc287f3772e8474e.tar.gz |
C++: fix code completion: casting inside parentheses
Included unit tests.
Task-number: QTCREATORBUG-8368
Change-Id: I1b04124bc2c9eac050cfb2e6d3a5c1aca5311f4b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/libs/cplusplus/ExpressionUnderCursor.cpp')
-rw-r--r-- | src/libs/cplusplus/ExpressionUnderCursor.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libs/cplusplus/ExpressionUnderCursor.cpp b/src/libs/cplusplus/ExpressionUnderCursor.cpp index b3e0694db0..0c8af020ba 100644 --- a/src/libs/cplusplus/ExpressionUnderCursor.cpp +++ b/src/libs/cplusplus/ExpressionUnderCursor.cpp @@ -157,6 +157,8 @@ int ExpressionUnderCursor::startOfExpression_helper(BackwardsScanner &tk, int in return index - 1; } else if (tk[index - 1].is(T_RPAREN)) { int matchingBraceIndex = tk.startOfMatchingBrace(index); + if (! matchingBraceIndex) + return matchingBraceIndex; if (matchingBraceIndex != index) { if (tk[matchingBraceIndex - 1].is(T_GREATER)) { int lessIndex = tk.startOfMatchingBrace(matchingBraceIndex); |