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

Clang: Improve function definition completion

Browse Source 
Insert argument list together with completion.

Task-number: QTCREATORBUG-20826
Change-Id: I4aa9faaa04bcd3ca014306aad27843c2b4419d3c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-07-31 09:48:02 +02:00
parent 83024557d6
commit 810896936b
5 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,6 +164,7 @@ void ClangAssistProposalItem::apply(TextEditor::TextDocumentManipulatorInterface
if (autoInsertBrackets &&
(ccr.completionKind == CodeCompletion::FunctionCompletionKind
|| ccr.completionKind == CodeCompletion::FunctionDefinitionCompletionKind
|| ccr.completionKind == CodeCompletion::DestructorCompletionKind
|| ccr.completionKind == CodeCompletion::SignalCompletionKind
|| ccr.completionKind == CodeCompletion::SlotCompletionKind)) {
@@ -176,17 +177,40 @@ void ClangAssistProposalItem::apply(TextEditor::TextDocumentManipulatorInterface
while (manipulator.characterAt(cursor.position()) == ':')
cursor.movePosition(QTextCursor::PreviousWord, QTextCursor::MoveAnchor, 2);
const int previousWordStart = cursor.position();
// Move to the last character in the previous word
cursor.movePosition(QTextCursor::NextWord);
moveToPrevChar(manipulator, cursor);
const QString previousWord = manipulator.textAt(previousWordStart,
cursor.position() - previousWordStart + 1);
bool abandonParen = false;
if (manipulator.characterAt(cursor.position()) == '&') {
if (previousWord == "&") {
moveToPrevChar(manipulator, cursor);
const QChar prevChar = manipulator.characterAt(cursor.position());
abandonParen = QString("(;,{}").contains(prevChar);
}
if (!abandonParen)
abandonParen = isAtUsingDeclaration(manipulator, basePosition);
if (!abandonParen && ccr.completionKind == CodeCompletion::FunctionDefinitionCompletionKind) {
const CodeCompletionChunk resultType = ccr.chunks.first();
QTC_ASSERT(resultType.kind == CodeCompletionChunk::ResultType, return;);
if (previousWord == resultType.text.toString()) {
bool skipChunks = true;
for (const CodeCompletionChunk &chunk : ccr.chunks) {
if (chunk.kind == CodeCompletionChunk::TypedText) {
skipChunks = false;
continue;
}
if (skipChunks)
continue;
extraCharacters += chunk.text;
}
// To skip the next block.
abandonParen = true;
}
}
if (!abandonParen) {
if (completionSettings.m_spaceAfterFunctionName)
extraCharacters += QLatin1Char(' ');
@@ -338,6 +362,7 @@ QIcon ClangAssistProposalItem::icon() const
case CodeCompletion::ConstructorCompletionKind:
case CodeCompletion::DestructorCompletionKind:
case CodeCompletion::FunctionCompletionKind:
case CodeCompletion::FunctionDefinitionCompletionKind:
case CodeCompletion::TemplateFunctionCompletionKind:
case CodeCompletion::ObjCMessageCompletionKind:
switch (m_codeCompletion.availability) {