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

Revert "CodeAssist: Avoid pointless completion request after accepting item"

Browse Source 
is replaced by 23d63dcc8b

This reverts commit 44b71f7a16.

Change-Id: Ib5adaab4a962a54495b48e6b88ab164046526c37
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
David Schulz
2020-09-23 09:05:59 +02:00
parent 8b031c8c05
commit a36bdfc858
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/texteditor/codeassist/codeassistant.cpp
View File

@@ -105,7 +105,6 @@ private:
IAssistProposalWidget *m_proposalWidget = nullptr; IAssistProposalWidget *m_proposalWidget = nullptr;
QScopedPointer<IAssistProposal> m_proposal; QScopedPointer<IAssistProposal> m_proposal;
bool m_receivedContentWhileWaiting = false; bool m_receivedContentWhileWaiting = false;
bool m_proposalItemProcessed = false;
QTimer m_automaticProposalTimer; QTimer m_automaticProposalTimer;
CompletionSettings m_settings; CompletionSettings m_settings;
int m_abortedBasePosition = -1; int m_abortedBasePosition = -1;
@@ -194,13 +193,6 @@ void CodeAssistantPrivate::requestProposal(AssistReason reason,
if (m_editorWidget->hasBlockSelection()) if (m_editorWidget->hasBlockSelection())
return; // TODO return; // TODO
if (m_proposalItemProcessed
&& reason == IdleEditor
&& m_assistKind == TextEditor::Completion
&& !identifyActivationSequence()) {
return;
}
if (!provider) { if (!provider) {
if (kind == Completion) if (kind == Completion)
provider = m_editorWidget->textDocument()->completionAssistProvider(); provider = m_editorWidget->textDocument()->completionAssistProvider();
@@ -373,15 +365,6 @@ void CodeAssistantPrivate::processProposalItem(AssistProposalItemInterface *prop
proposalItem->apply(manipulator, m_proposal->basePosition()); proposalItem->apply(manipulator, m_proposal->basePosition());
destroyContext(); destroyContext();
m_editorWidget->encourageApply(); m_editorWidget->encourageApply();
m_proposalItemProcessed = true;
auto connection = std::make_shared<QMetaObject::Connection>();
*connection = connect(m_editorWidget->textDocument(),
&Core::IDocument::contentsChanged,
this, [this, connection] {
m_proposalItemProcessed = false;
disconnect(*connection);
});
} }
void CodeAssistantPrivate::handlePrefixExpansion(const QString &newPrefix) void CodeAssistantPrivate::handlePrefixExpansion(const QString &newPrefix)