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

Avoid completing a closing parenthesis in the wrong place

Browse Source 
Need to check the character to the right of the cursor.
This commit is contained in:
Thorbjørn Lindeijer
2009-09-22 16:52:27 +02:00
parent 7a920e46b2
commit bf74d21d6c
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -1862,5 +1862,3 @@ SemanticInfo SemanticHighlighter::semanticInfo(const Source &source)
return semanticInfo; return semanticInfo;
} }

4
src/plugins/cpptools/cppcodecompletion.cpp
View File

@@ -46,6 +46,7 @@
#include <cplusplus/ResolveExpression.h> #include <cplusplus/ResolveExpression.h>
#include <cplusplus/LookupContext.h> #include <cplusplus/LookupContext.h>
#include <cplusplus/MatchingText.h>
#include <cplusplus/Overview.h> #include <cplusplus/Overview.h>
#include <cplusplus/ExpressionUnderCursor.h> #include <cplusplus/ExpressionUnderCursor.h>
#include <cplusplus/TokenUnderCursor.h> #include <cplusplus/TokenUnderCursor.h>
@@ -1510,6 +1511,8 @@ void CppCodeCompletion::complete(const TextEditor::CompletionItem &item)
if (endWithSemicolon) if (endWithSemicolon)
extraChars += QLatin1Char(';'); extraChars += QLatin1Char(';');
} else if (autoParenthesesEnabled) { } else if (autoParenthesesEnabled) {
const QChar lookAhead = m_editor->characterAt(m_editor->position() + 1);
if (MatchingText::shouldInsertMatchingText(lookAhead)) {
extraChars += QLatin1Char(')'); extraChars += QLatin1Char(')');
--cursorOffset; --cursorOffset;
if (endWithSemicolon) { if (endWithSemicolon) {
@@ -1521,6 +1524,7 @@ void CppCodeCompletion::complete(const TextEditor::CompletionItem &item)
} }
} }
} }
}
// Avoid inserting characters that are already there // Avoid inserting characters that are already there
for (int i = 0; i < extraChars.length(); ++i) { for (int i = 0; i < extraChars.length(); ++i) {