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

Clang: Clean up clangassistproposalitem.cpp

Browse Source 
Change-Id: I200041b48a337912e7b3297881db58f7cf1f9b0e
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-08-11 10:35:57 +02:00
parent 415d3c4784
commit 3e9ebc24be
1 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/clangcodemodel/clangassistproposalitem.cpp
View File

@@ -32,10 +32,10 @@
#include <cplusplus/Token.h> #include <cplusplus/Token.h>
#include <texteditor/completionsettings.h> #include <texteditor/completionsettings.h>
#include <texteditor/textdocument.h>
#include <texteditor/texteditor.h>
#include <texteditor/texteditorsettings.h> #include <texteditor/texteditorsettings.h>
#include <QTextCursor>
using namespace CPlusPlus; using namespace CPlusPlus;
using namespace ClangBackEnd; using namespace ClangBackEnd;
@@ -86,12 +86,11 @@ void ClangAssistProposalItem::apply(TextEditor::TextDocumentManipulatorInterface
bool setAutoCompleteSkipPos = false; bool setAutoCompleteSkipPos = false;
int currentPosition = manipulator.currentPosition(); int currentPosition = manipulator.currentPosition();
bool autoParenthesesEnabled = true;
if (m_completionOperator == T_SIGNAL || m_completionOperator == T_SLOT) { if (m_completionOperator == T_SIGNAL || m_completionOperator == T_SLOT) {
extraCharacters += QLatin1Char(')'); extraCharacters += QLatin1Char(')');
if (m_typedCharacter == QLatin1Char('(')) // Eat the opening parenthesis if (m_typedCharacter == QLatin1Char('(')) // Eat the opening parenthesis
m_typedCharacter = QChar(); m_typedCharacter = QChar();
} else if (ccr.completionKind() == CodeCompletion::KeywordCompletionKind) { } else if (ccr.completionKind() == CodeCompletion::KeywordCompletionKind) {
CompletionChunksToTextConverter converter; CompletionChunksToTextConverter converter;
converter.setupForKeywords(); converter.setupForKeywords();
@@ -160,7 +159,7 @@ void ClangAssistProposalItem::apply(TextEditor::TextDocumentManipulatorInterface
extraCharacters += semicolon; extraCharacters += semicolon;
m_typedCharacter = QChar(); m_typedCharacter = QChar();
} }
} else if (autoParenthesesEnabled) { } else {
const QChar lookAhead = manipulator.characterAt(manipulator.currentPosition() + 1); const QChar lookAhead = manipulator.characterAt(manipulator.currentPosition() + 1);
if (MatchingText::shouldInsertMatchingText(lookAhead)) { if (MatchingText::shouldInsertMatchingText(lookAhead)) {
extraCharacters += QLatin1Char(')'); extraCharacters += QLatin1Char(')');
@@ -175,19 +174,6 @@ void ClangAssistProposalItem::apply(TextEditor::TextDocumentManipulatorInterface
} }
} }
} }
#if 0
if (autoInsertBrackets && data().canConvert<CompleteFunctionDeclaration>()) {
if (m_typedChar == QLatin1Char('('))
m_typedChar = QChar();
// everything from the closing parenthesis on are extra chars, to
// make sure an auto-inserted ")" gets replaced by ") const" if necessary
int closingParen = toInsert.lastIndexOf(QLatin1Char(')'));
extraChars = toInsert.mid(closingParen);
toInsert.truncate(closingParen);
}
#endif
} }
// Append an unhandled typed character, adjusting cursor offset when it had been adjusted before // Append an unhandled typed character, adjusting cursor offset when it had been adjusted before
@@ -360,4 +346,3 @@ const ClangBackEnd::CodeCompletion &ClangAssistProposalItem::codeCompletion() co
} // namespace Internal } // namespace Internal
} // namespace ClangCodeModel } // namespace ClangCodeModel