add ReconnectAction and add it in status bar popup (#401)

* add ReconnectAction and add it in status bar popup

* Extract string to bundle

Author: vol0n

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

@@ -0,0 +1,17 @@
+package org.utbot.cpp.clion.plugin.actions
+
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.components.service
+import org.utbot.cpp.clion.plugin.UTBot
+import org.utbot.cpp.clion.plugin.client.ClientManager
+
+class ReconnectAction: AnAction(UTBot.message("actions.reconnect")) {
+    override fun actionPerformed(e: AnActionEvent) {
+        e.project!!.service<ClientManager>().restartClient()
+    }
+
+    override fun update(e: AnActionEvent) {
+        e.presentation.isEnabledAndVisible = e.project != null
+    }
+}

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

@@ -17,13 +17,15 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
 import org.jetbrains.annotations.TestOnly
+import org.utbot.cpp.clion.plugin.UTBot
 import org.utbot.cpp.clion.plugin.client.channels.LogChannel
 import org.utbot.cpp.clion.plugin.client.requests.CheckProjectConfigurationRequest
 import org.utbot.cpp.clion.plugin.grpc.getProjectConfigGrpcRequest
 import org.utbot.cpp.clion.plugin.listeners.ConnectionStatus
 import org.utbot.cpp.clion.plugin.listeners.UTBotEventsListener
 import org.utbot.cpp.clion.plugin.settings.projectIndependentSettings
 import org.utbot.cpp.clion.plugin.utils.logger
+import org.utbot.cpp.clion.plugin.utils.notifyWarning
 import testsgen.Testgen
 
 /**
@@ -72,6 +74,7 @@ class Client(
         if (isDisposed) {
             // if client is disposed, then connection settings were changed, and requests issued to this client
             // are no longer relevant, so we don't execute them
+            notifyWarning(UTBot.message("warning.reconnecting"))
             return
         }
         executeRequestImpl(request)

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

@@ -12,7 +12,7 @@ import org.utbot.cpp.clion.plugin.listeners.ConnectionSettingsListener
 import org.utbot.cpp.clion.plugin.utils.logger
 
 @Service
-class ClientManager(val project: Project): Disposable {
+class ClientManager(val project: Project) : Disposable {
     private val clientId = generateClientID()
     private val loggingChannels = listOf<LogChannel>(GTestLogChannelImpl(project), ServerLogChannelImpl(project))
     var client: Client = Client(project, clientId, loggingChannels)
@@ -28,14 +28,18 @@ class ClientManager(val project: Project): Disposable {
                 override fun connectionSettingsChanged(newPort: Int, newServerName: String) {
                     if (newPort != client.port || newServerName != client.serverName) {
                         project.logger.trace { "Connection settings changed. Setting up new client." }
-                        client.dispose()
-                        client = Client(project, clientId, loggingChannels)
+                        restartClient()
                     }
                 }
             })
         }
     }
 
+    fun restartClient() {
+        client.dispose()
+        client = Client(project, clientId, loggingChannels)
+    }
+
     override fun dispose() = client.dispose()
 
     private fun generateClientID(): String {

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/statusBar/StatusBarConnectionStatus.kt

@@ -13,6 +13,7 @@ import com.intellij.openapi.wm.StatusBarWidgetFactory
 import com.intellij.ui.awt.RelativePoint
 import com.intellij.util.Consumer
 import org.utbot.cpp.clion.plugin.actions.AskServerToGenerateJsonForProjectConfiguration
+import org.utbot.cpp.clion.plugin.actions.ReconnectAction
 import org.utbot.cpp.clion.plugin.actions.configure.ConfigureProjectAction
 import org.utbot.cpp.clion.plugin.actions.configure.ReconfigureProjectAction
 import org.utbot.cpp.clion.plugin.actions.ShowWizardAction
@@ -105,6 +106,8 @@ object StatusBarActionsPopup {
         actionGroup.addSeparator()
         actionGroup.add(ConfigureProjectAction())
         actionGroup.addSeparator()
+        actionGroup.add(ReconnectAction())
+        actionGroup.addSeparator()
         actionGroup.addAction(ReconfigureProjectAction())
 
         return actionGroup

clion-plugin/src/main/resources/META-INF/plugin.xml

@@ -188,8 +188,16 @@
                 description="Generates tests for file without context of a project">
             <synonym text="US"/>
         </action>
+
         <action id="org.utbot.cpp.clion.plugin.actions.generate.RunAllTestsWithCoverageAction"
                 class="org.utbot.cpp.clion.plugin.actions.generate.RunAllTestsWithCoverageAction"
                 text="UTBot: Run All Tests and Show Coverage"/>
+
+        <action id="org.utbot.cpp.clion.plugin.actions.ReconnectAction"
+                class="org.utbot.cpp.clion.plugin.actions.ReconnectAction" text="Reconnect to Server"
+                description="Recreates connection to server, useful when you launch the server and plugin don&#39;t connect immedeately">
+            <override-text place="GoToAction" text="UTBot: Reconnect to Server"/>
+        </action>
+
     </actions>
 </idea-plugin>

clion-plugin/src/main/resources/messages/UTBot.properties

@@ -14,6 +14,7 @@ settings.project.remotePath=Path to project on remote machine
 settings.project.serverName=Server host name
 settings.project.port=Server port
 settings.project.cmakeOptions=Cmake options
+actions.reconnect=Reconnect to Server
 requests.assertion.description.progress=Generating for assertion...
 requests.file.description.progress=Generating for file...
 requests.function.description.progress=Generating for function...
@@ -49,3 +50,4 @@ advanced.timeoutPerFunction.description=Maximum time (in seconds) alloted for ge
 advanced.timeoutPerTest.title=Timeout per test:
 advanced.timeoutPerTest.description=Maximum time (in seconds) alloted for a single test run. Set to non-positive number to disable it. <a href=https://github.com/UnitTestBot/UTBotCpp/wiki/vscode-extension-settings#timeout-per-test>Learn more</a>
 targets.notargets.description=No targets can be found by UTBot in current project
+warning.reconnecting=Reconnecting to server! Request won't be executed! Please try again, later.