C++: Do not insert matching } within string

Regression from

    commit a6aa287720
    C++: Fine-tune auto insertion of '}'

Change-Id: I3ede8c7a1e3c73708d5d5a59c314e4b4596976b2
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-08-07 11:17:21 +02:00
parent cac4b7c87c
commit 9092ef7992
2 changed files with 12 additions and 0 deletions

View File

@@ -326,6 +326,11 @@ static bool allowAutoClosingBrace(const QTextCursor &cursor,
int prevState;
const Tokens tokens = getTokens(cursor, prevState);
const Token token = tokenAtPosition(tokens, cursor.positionInBlock());
if (token.isStringLiteral())
return false;
if (isAfterNamespaceDefinition(tokens, cursor.positionInBlock()))
return false;