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

C++: Do not auto-insert '}' after control flow constructs

Browse Source 
...as this rather gets in the way.

As before, pressing ENTER after { will still auto insert } on the next
line.

Fixes: QTCREATORBUG-18872
Change-Id: I8ee082962b5ee82781e51c3e5ee146343f808332
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Nikolai Kosjar
2019-05-24 15:09:00 +02:00
parent 3b05eb88bd
commit 0bac3ad279
2 changed files with 64 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -358,6 +358,32 @@ static bool isAfterRecordLikeDefinition(const BackwardsScanner &tokens, int inde
return false;
}
static bool isControlFlowKeywordRequiringParentheses(const Token &token)
{
return token.is(T_IF)
|| token.is(T_WHILE)
|| token.is(T_FOR)
|| token.is(T_SWITCH)
|| token.is(T_CATCH);
}
static bool isAfterControlFlow(const BackwardsScanner &tokens, int index)
{
const Token &token = tokens[index];
if (token.is(T_DO) || token.is(T_ELSE) || token.is(T_TRY))
return true;
if (token.is(T_RPAREN)) {
const int startIndex = index + 1;
const int matchingBraceIndex = tokens.startOfMatchingBrace(startIndex);
if (matchingBraceIndex == startIndex)
return false; // No matching paren found.
return isControlFlowKeywordRequiringParentheses(tokens[matchingBraceIndex - 1]);
}
return false;
}
static bool allowAutoClosingBrace(const QTextCursor &cursor,
MatchingText::IsNextBlockDeeperIndented isNextIndented)
{
@@ -370,6 +396,9 @@ static bool allowAutoClosingBrace(const QTextCursor &cursor,
if (tokens[index].isStringLiteral())
return false;
if (isAfterControlFlow(tokens, index))
return false;
if (isAfterNamespaceDefinition(tokens, index))
return false;

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

@@ -221,6 +221,41 @@ TEST_F(MatchingText, ContextAllowsAutoParentheses_CurlyBrace_NotInTheMiddle)
ASSERT_FALSE(MT::contextAllowsAutoParentheses(document.cursor, "{"));
}
TEST_F(MatchingText, ContextAllowsAutoParentheses_CurlyBrace_NotAfterControlFlow_WhileAndFriends)
{
const Document document("while (true) @");
ASSERT_FALSE(MT::contextAllowsAutoParentheses(document.cursor, "{"));
}
TEST_F(MatchingText, ContextAllowsAutoParentheses_CurlyBrace_NotAfterControlFlow_DoAndFriends)
{
const Document document("do @");
ASSERT_FALSE(MT::contextAllowsAutoParentheses(document.cursor, "{"));
}
TEST_F(MatchingText, ContextAllowsAutoParentheses_CurlyBrace_InvalidCode_UnbalancedParens)
{
const Document document(") @");
ASSERT_TRUE(MT::contextAllowsAutoParentheses(document.cursor, "{"));
}
TEST_F(MatchingText, ContextAllowsAutoParentheses_CurlyBrace_InvalidCode_UnbalancedParens2)
{
const Document document("while true) @");
ASSERT_TRUE(MT::contextAllowsAutoParentheses(document.cursor, "{"));
}
TEST_F(MatchingText, ContextAllowsAutoParentheses_CurlyBrace_InvalidCode_OnlyBalancedParens)
{
const Document document("() @");
ASSERT_TRUE(MT::contextAllowsAutoParentheses(document.cursor, "{"));
}
TEST_F(MatchingText, ContextAllowsAutoParentheses_CurlyBrace_NotBeforeNamedNamespace)
{
const Document document("namespace X @");