From 270a9839e2d7ca9bfe39dd72e2f7e541ba0d625e Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 31 Aug 2023 08:15:34 +0200 Subject: [PATCH] Copilot: start the client in the delayed initialize phase Change-Id: I4470491f5f0a2b1d88ed5b2e23444bf3a28d8256 Reviewed-by: Marcus Tillmanns --- src/plugins/copilot/copilotplugin.cpp | 13 +++++++++---- src/plugins/copilot/copilotplugin.h | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/plugins/copilot/copilotplugin.cpp b/src/plugins/copilot/copilotplugin.cpp index cfc5ab8c83c..8af42ae0c07 100644 --- a/src/plugins/copilot/copilotplugin.cpp +++ b/src/plugins/copilot/copilotplugin.cpp @@ -57,10 +57,6 @@ void cycleSuggestion(TextEditor::TextEditorWidget *editor, Direction direction) void CopilotPlugin::initialize() { - restartClient(); - - connect(&settings(), &AspectContainer::applied, this, &CopilotPlugin::restartClient); - QAction *requestAction = new QAction(this); requestAction->setText(Tr::tr("Request Copilot Suggestion")); requestAction->setToolTip( @@ -151,6 +147,15 @@ void CopilotPlugin::initialize() ProjectPanelFactory::registerFactory(panelFactory); } +bool CopilotPlugin::delayedInitialize() +{ + restartClient(); + + connect(&settings(), &AspectContainer::applied, this, &CopilotPlugin::restartClient); + + return true; +} + void CopilotPlugin::restartClient() { LanguageClient::LanguageClientManager::shutdownClient(m_client); diff --git a/src/plugins/copilot/copilotplugin.h b/src/plugins/copilot/copilotplugin.h index 3533a17e831..9f709b2a101 100644 --- a/src/plugins/copilot/copilotplugin.h +++ b/src/plugins/copilot/copilotplugin.h @@ -19,6 +19,7 @@ class CopilotPlugin : public ExtensionSystem::IPlugin public: void initialize() override; + bool delayedInitialize() override; void restartClient(); ShutdownFlag aboutToShutdown() override;