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

C++: optimize paragraph insertion.

Browse Source 
Do not check tokens which are returning the default return value.
Do not check for tokens when a previous condition excludes the other
token types.

Change-Id: Id97aed9d6342c6c12e9b26acdd0a8c4b0bca0868
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
David Schulz
2016-04-18 15:57:09 +02:00
parent 1d1f450081
commit 42ed3b44c8
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -329,11 +329,7 @@ QString MatchingText::insertParagraphSeparator(const QTextCursor &cursor)
const Token &token = tk[index - 1];
if (token.is(T_STRING_LITERAL) && tk[index - 2].is(T_EXTERN)) {
// recognized extern "C"
return QLatin1String("}");
} else if (token.is(T_IDENTIFIER)) {
if (token.is(T_IDENTIFIER)) {
int i = index - 1;
forever {
@@ -369,12 +365,6 @@ QString MatchingText::insertParagraphSeparator(const QTextCursor &cursor)
--i;
}
}
if (token.is(T_NAMESPACE)) {
// anonymous namespace
return QLatin1String("}");
} else if (token.is(T_CLASS) || token.is(T_STRUCT) || token.is(T_UNION) || token.is(T_ENUM)) {
if (tk[index - 2].is(T_TYPEDEF)) {
// recognized:
@@ -392,7 +382,7 @@ QString MatchingText::insertParagraphSeparator(const QTextCursor &cursor)
const int lparenIndex = tk.startOfMatchingBrace(index);
if (lparenIndex == index) {
// found an unmatched brace. We don't really know to do in this case.
// found an unmatched brace. We don't really know what to do in this case.
return QString();
}