diff options
| author | Nikolai Kosjar <[email protected]> | 2017-08-07 11:17:21 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <[email protected]> | 2017-08-07 13:01:30 +0000 |
| commit | 9092ef7992b685b122c4e593f2ad3ee545c1f0c4 (patch) | |
| tree | b1f7d5905d37c315e5a8abc1c274f74074e91d17 /src/libs/cplusplus | |
| parent | cac4b7c87c57089c1f36ec25e58239ddb5ff0302 (diff) | |
C++: Do not insert matching } within string
Regression from
commit a6aa287720112c70c1363bcb46d55d438fe57eac
C++: Fine-tune auto insertion of '}'
Change-Id: I3ede8c7a1e3c73708d5d5a59c314e4b4596976b2
Reviewed-by: Ivan Donchevskii <[email protected]>
Reviewed-by: Christian Stenger <[email protected]>
Diffstat (limited to 'src/libs/cplusplus')
| -rw-r--r-- | src/libs/cplusplus/MatchingText.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libs/cplusplus/MatchingText.cpp b/src/libs/cplusplus/MatchingText.cpp index e2f04e4f0f2..447c91ea591 100644 --- a/src/libs/cplusplus/MatchingText.cpp +++ b/src/libs/cplusplus/MatchingText.cpp @@ -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; |