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

TextEditor: skip auto completion while suggestion is visible

Browse Source 
The use can still explicitly request completions in that case via the
keyboard shortcut.

Change-Id: I4ed47232a24288c540d1357c0f876a1cdfcfec08
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
David Schulz
2023-03-16 07:13:42 +01:00
parent 7f56ccaa9e
commit 8247d578c7
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -444,6 +444,7 @@ void CodeAssistantPrivate::automaticProposalTimeout()
{ {
if (isWaitingForProposal() if (isWaitingForProposal()
|| m_editorWidget->multiTextCursor().hasMultipleCursors() || m_editorWidget->multiTextCursor().hasMultipleCursors()
|| m_editorWidget->suggestionVisible()
|| (isDisplayingProposal() && !m_proposalWidget->isFragile())) { || (isDisplayingProposal() && !m_proposalWidget->isFragile())) {
return; return;
} }

5
src/plugins/texteditor/texteditor.cpp
View File

@@ -5952,6 +5952,11 @@ void TextEditorWidget::clearSuggestion()
d->clearCurrentSuggestion(); d->clearCurrentSuggestion();
} }
bool TextEditorWidget::suggestionVisible() const
{
return d->m_suggestionBlock.isValid();
}
#ifdef WITH_TESTS #ifdef WITH_TESTS
void TextEditorWidget::processTooltipRequest(const QTextCursor &c) void TextEditorWidget::processTooltipRequest(const QTextCursor &c)
{ {

1
src/plugins/texteditor/texteditor.h
View File

@@ -471,6 +471,7 @@ public:
void insertSuggestion(const QString &suggestion); void insertSuggestion(const QString &suggestion);
void clearSuggestion(); void clearSuggestion();
bool suggestionVisible() const;
#ifdef WITH_TESTS #ifdef WITH_TESTS
void processTooltipRequest(const QTextCursor &c); void processTooltipRequest(const QTextCursor &c);