From fbf8b4d3c3f7272231ac60f17df9c5ef9b2beaed Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 16 Nov 2023 15:07:46 +0100 Subject: [PATCH] Copilot: fix applying copilot suggestions word by word via the ctrl+right shortcut Change-Id: I1a9460a456833c7ddd35a42a63eaf75b8e2930b3 Reviewed-by: Artem Sokolovskii --- src/plugins/copilot/copilotsuggestion.cpp | 2 +- src/plugins/texteditor/textdocumentlayout.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/copilot/copilotsuggestion.cpp b/src/plugins/copilot/copilotsuggestion.cpp index 28da286f1f7..8fcac6ee663 100644 --- a/src/plugins/copilot/copilotsuggestion.cpp +++ b/src/plugins/copilot/copilotsuggestion.cpp @@ -72,7 +72,7 @@ void CopilotSuggestion::reset() int CopilotSuggestion::position() { - return m_start.position(); + return m_start.selectionEnd(); } } // namespace Copilot::Internal diff --git a/src/plugins/texteditor/textdocumentlayout.cpp b/src/plugins/texteditor/textdocumentlayout.cpp index 6efa145aace..6b98673bf85 100644 --- a/src/plugins/texteditor/textdocumentlayout.cpp +++ b/src/plugins/texteditor/textdocumentlayout.cpp @@ -603,7 +603,7 @@ bool TextDocumentLayout::updateSuggestion(const QTextBlock &block, { if (TextSuggestion *suggestion = TextDocumentLayout::suggestion(block)) { auto positionInBlock = position - block.position(); - if (positionInBlock < suggestion->position()) + if (position < suggestion->position()) return false; const QString start = block.text().left(positionInBlock); const QString end = block.text().mid(positionInBlock);