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

LanguageClient: use internal filtering if we got all completions

Browse Source 
... at the current position. This reduces the amount of requested
completions.

Change-Id: I0fa35269bc123513217e3b3abd2c921bd92d8d10
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
David Schulz
2022-11-10 13:33:25 +01:00
parent 63a8218680
commit 5eca1ff873
4 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,6 +51,7 @@ public:
void displayProposal(IAssistProposal *newProposal, AssistReason reason);
bool isDisplayingProposal() const;
bool isWaitingForProposal() const;
QString proposalPrefix() const;
void notifyChange();
bool hasContext() const;
@@ -134,7 +135,7 @@ void CodeAssistantPrivate::invoke(AssistKind kind, IAssistProvider *provider)
stopAutomaticProposalTimer();
if (isDisplayingProposal() && m_assistKind == kind && !m_proposal->isFragile()
&& m_proposal->supportsPrefix()) {
&& m_proposal->supportsPrefixFiltering(proposalPrefix())) {
m_proposalWidget->setReason(ExplicitlyInvoked);
m_proposalWidget->updateProposal(m_editorWidget->textAt(
m_proposal->basePosition(),
@@ -426,6 +427,14 @@ bool CodeAssistantPrivate::isWaitingForProposal() const
return m_requestRunner != nullptr || m_asyncProcessor != nullptr;
}
QString CodeAssistantPrivate::proposalPrefix() const
{
if (!isDisplayingProposal())
return {};
return m_editorWidget->textAt(m_proposal->basePosition(),
m_editorWidget->position() - m_proposal->basePosition());
}
void CodeAssistantPrivate::invalidateCurrentRequestData()
{
m_asyncProcessor = nullptr;
@@ -468,14 +477,15 @@ void CodeAssistantPrivate::notifyChange()
QTC_ASSERT(m_proposal, return);
if (m_editorWidget->position() < m_proposal->basePosition()) {
destroyContext();
} else if (m_proposal->supportsPrefix()) {
m_proposalWidget->updateProposal(
m_editorWidget->textAt(m_proposal->basePosition(),
m_editorWidget->position() - m_proposal->basePosition()));
if (!isDisplayingProposal())
requestActivationCharProposal();
} else {
requestProposal(m_proposal->reason(), m_assistKind, m_requestProvider, true);
const QString prefix = proposalPrefix();
if (m_proposal->supportsPrefixFiltering(prefix)) {
m_proposalWidget->updateProposal(prefix);
if (!isDisplayingProposal())
requestActivationCharProposal();
} else {
requestProposal(m_proposal->reason(), m_assistKind, m_requestProvider, true);
}
}
}
}