Avoid completing a closing parenthesis in the wrong place

Need to check the character to the right of the cursor.

1 files changed, 8 insertions, 4 deletions

diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index 4c7c0a038f..63a4d4c6cc 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -46,6 +46,7 @@
 
 #include <cplusplus/ResolveExpression.h>
 #include <cplusplus/LookupContext.h>
+#include <cplusplus/MatchingText.h>
 #include <cplusplus/Overview.h>
 #include <cplusplus/ExpressionUnderCursor.h>
 #include <cplusplus/TokenUnderCursor.h>
@@ -1510,11 +1511,14 @@ void CppCodeCompletion::complete(const TextEditor::CompletionItem &item)
                         if (endWithSemicolon)
                             extraChars += QLatin1Char(';');
                     } else if (autoParenthesesEnabled) {
-                        extraChars += QLatin1Char(')');
-                        --cursorOffset;
-                        if (endWithSemicolon) {
-                            extraChars += QLatin1Char(';');
+                        const QChar lookAhead = m_editor->characterAt(m_editor->position() + 1);
+                        if (MatchingText::shouldInsertMatchingText(lookAhead)) {
+                            extraChars += QLatin1Char(')');
                             --cursorOffset;
+                            if (endWithSemicolon) {
+                                extraChars += QLatin1Char(';');
+                                --cursorOffset;
+                            }
                         }
                     }
                 }