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

CodeAssist: Fix auto completion if function signature is shown

Browse Source 
This reverts

    commit 3bf19030ab.
    CodeAssist: Fragile proposals aren't closed by automatic proposals.

which fixed the case [1] but introduced the regression in case [2]. Re-
implement the fix for [1] in a different way: Check whether the new
proposal has any items to show before closing the function signature
hint.

Case [1]
  void f(int);
  void g()
  {
      f(bar // This is what we will have in the end. The steps are:
            // 1. Type "f("
            //    --> OK, function signature pop up is shown.
            // 2. Type "bar"
            //    --> OPS, function signature pop up is closed and no
            //        new completion list is shown because "bar" does
            //        not match any declarations.
  }

Case [2]
  int barman = 0;
  void f(int);
  void g()
  {
      f(bar // This is what we will have in the end. The steps are:
            // 1. Type "f("
            //    --> OK, function signature pop up is shown.
            // 2. Type "bar"
            //    --> OPS, no auto completion list for "barman" is
            //        proposed.
  }

Task-number: QTCREATORBUG-16934
Change-Id: I8456275d951de9e6fc53285a5dbcbd448d49ad08
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-04-27 15:44:37 +02:00
parent a4a78ae8b1
commit fab4dd068e
7 changed files with 108 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,8 +181,7 @@ void CodeAssistantPrivate::process()
}
}
if (!isDisplayingProposal())
startAutomaticProposalTimer();
startAutomaticProposalTimer();
} else {
m_assistKind = TextEditor::Completion;
}
@@ -288,18 +287,33 @@ void CodeAssistantPrivate::displayProposal(IAssistProposal *newProposal, AssistR
QScopedPointer<IAssistProposal> proposalCandidate(newProposal);
bool destroyCurrentContext = false;
if (isDisplayingProposal()) {
if (!m_proposal->isFragile())
return;
destroyContext();
destroyCurrentContext = true;
}
int basePosition = proposalCandidate->basePosition();
if (m_editorWidget->position() < basePosition)
if (m_editorWidget->position() < basePosition) {
if (destroyCurrentContext)
destroyContext();
return;
}
if (m_abortedBasePosition == basePosition && reason != ExplicitlyInvoked) {
if (destroyCurrentContext)
destroyContext();
return;
}
const QString prefix = m_editorWidget->textAt(basePosition,
m_editorWidget->position() - basePosition);
if (!newProposal->hasItemsToPropose(prefix, reason))
return;
if (m_abortedBasePosition == basePosition && reason != ExplicitlyInvoked)
return;
if (destroyCurrentContext)
destroyContext();
clearAbortedPosition();
m_proposal.reset(proposalCandidate.take());
@@ -325,9 +339,7 @@ void CodeAssistantPrivate::displayProposal(IAssistProposal *newProposal, AssistR
m_proposalWidget->setModel(m_proposal->model());
m_proposalWidget->setDisplayRect(m_editorWidget->cursorRect(basePosition));
m_proposalWidget->setIsSynchronized(!m_receivedContentWhileWaiting);
m_proposalWidget->showProposal(m_editorWidget->textAt(
basePosition,
m_editorWidget->position() - basePosition));
m_proposalWidget->showProposal(prefix);
}
void CodeAssistantPrivate::processProposalItem(AssistProposalItemInterface *proposalItem)
@@ -406,6 +418,8 @@ void CodeAssistantPrivate::notifyChange()
m_proposalWidget->updateProposal(
m_editorWidget->textAt(m_proposal->basePosition(),
m_editorWidget->position() - m_proposal->basePosition()));
if (m_proposal->isFragile())
startAutomaticProposalTimer();
}
}
}
@@ -438,7 +452,7 @@ void CodeAssistantPrivate::startAutomaticProposalTimer()
void CodeAssistantPrivate::automaticProposalTimeout()
{
if (isWaitingForProposal() || isDisplayingProposal())
if (isWaitingForProposal() || (isDisplayingProposal() && !m_proposal->isFragile()))
return;
requestProposal(IdleEditor, Completion);