Fix after rebase

Author: EgorkaKulikov

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/UTBotStartupActivity.kt

@@ -1,28 +1,28 @@
 package org.utbot.cpp.clion.plugin
 
 import com.intellij.ide.util.RunOnceUtil
+import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.StartupActivity
 import org.utbot.cpp.clion.plugin.client.Client
 import org.utbot.cpp.clion.plugin.client.ClientManager
 import org.utbot.cpp.clion.plugin.settings.pluginSettings
 import org.utbot.cpp.clion.plugin.settings.settings
 import org.utbot.cpp.clion.plugin.ui.wizard.UTBotWizard
-import org.utbot.cpp.clion.plugin.utils.getCurrentClient
 import org.utbot.cpp.clion.plugin.utils.invokeOnEdt
 
 class UTBotStartupActivity : StartupActivity {
     override fun runActivity(project: Project) {
-        // we initialize Client here, so that initialization will not happen when user issues first
-        // generation request which would cause a UI freeze
+        // We initialize Client here, so that initialization will not happen
+        // when user issues first generation request which would cause a UI freeze.
         initializeClient(project)
         guessPathsOnFirstOpen(project)
         showWizardOnFirstOpen(project)
     }
 
     // Here we address the service ClientManager for the first time so that it
     // will be initialized by the ide and Client will be created.
-    // Client in turn will create a grpc channel and start heartbeating the server
+    // Client in turn will create a grpc channel and start heart-beating the server.
     private fun initializeClient(project: Project) = project.service<ClientManager>()
 
 

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/utils/ClientUtils.kt

@@ -11,9 +11,15 @@ import org.utbot.cpp.clion.plugin.client.logger.ClientLogger
 //TODO: remove logger from this file
 val Project.logger: ClientLogger get() = this.service()
 
-fun AnActionEvent.getClient(): Client = this.getRequiredData(CommonDataKeys.PROJECT).getClient()
+val AnActionEvent.currentClient: Client
+    get() = this.getRequiredData(CommonDataKeys.PROJECT).getCurrentClient()
 
-fun Project.getClient(): Client = this.service<ClientManager>().client
+/**
+ * NB: [Client] can be changed when user changes connection settings.
+ * Use this function to obtain a reference to a Client and execute request
+ * using Client#executeRequestIfNotDisposed.
+ */
+fun Project.getCurrentClient(): Client = this.service<ClientManager>().client
 
 fun AnActionEvent.activeProject() = this.project
     ?: error("A project related to action event $this not found")