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

CodeAssist: Fragile proposals aren't closed by automatic proposals.

Browse Source 
Task-number: QTCREATORBUG-15854
Change-Id: I2334305f0ff64ea1b4acc28923749e3d28903f61
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
David Schulz
2016-03-16 15:53:39 +01:00
parent 9184cc433b
commit 3bf19030ab
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,7 +197,8 @@ void CodeAssistantPrivate::process()
} }
} }
startAutomaticProposalTimer(); if (!isDisplayingProposal())
startAutomaticProposalTimer();
} else { } else {
m_assistKind = TextEditor::Completion; m_assistKind = TextEditor::Completion;
} }
@@ -431,8 +432,6 @@ void CodeAssistantPrivate::notifyChange()
m_proposalWidget->updateProposal( m_proposalWidget->updateProposal(
m_editorWidget->textAt(m_proposal->basePosition(), m_editorWidget->textAt(m_proposal->basePosition(),
m_editorWidget->position() - m_proposal->basePosition())); m_editorWidget->position() - m_proposal->basePosition()));
if (m_proposal->isFragile())
startAutomaticProposalTimer();
} }
} }
} }
@@ -464,7 +463,7 @@ void CodeAssistantPrivate::startAutomaticProposalTimer()
void CodeAssistantPrivate::automaticProposalTimeout() void CodeAssistantPrivate::automaticProposalTimeout()
{ {
if (isWaitingForProposal() || (isDisplayingProposal() && !m_proposal->isFragile())) if (isWaitingForProposal() || isDisplayingProposal())
return; return;
requestProposal(IdleEditor, Completion); requestProposal(IdleEditor, Completion);