feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++: Do not insert matching } within string

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/cplusplus/MatchingText.cpp
View File

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

7
tests/unit/unittest/matchingtext-test.cpp
View File

@@ -256,4 +256,11 @@ TEST_F(MatchingText, ContextAllowsAutoParentheses_CurlyBrace_NotBeforeNestedName
ASSERT_FALSE(MT::contextAllowsAutoParentheses(document.cursor, "{")); ASSERT_FALSE(MT::contextAllowsAutoParentheses(document.cursor, "{"));
} }
TEST_F(MatchingText, ContextAllowsAutoParentheses_CurlyBrace_NotWithinString)
{
const Document document("\"a@b\"");
ASSERT_FALSE(MT::contextAllowsAutoParentheses(document.cursor, "{"));
}
} // anonymous } // anonymous