From 31ce303ee71214d40fdd714fdc287f3772e8474e Mon Sep 17 00:00:00 2001
From: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Date: Wed, 5 Dec 2012 09:20:52 +0100
Subject: 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>
---
 src/libs/cplusplus/ExpressionUnderCursor.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/libs/cplusplus/ExpressionUnderCursor.cpp')

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);
-- 
cgit v1.2.1