Refactor actions and their neighborhood (#346)

Author: EgorkaKulikov

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

@@ -1,20 +1,13 @@
 package org.utbot.cpp.clion.plugin.actions
 
-import com.intellij.notification.Notification
-import com.intellij.notification.NotificationAction
+import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import org.utbot.cpp.clion.plugin.UTBot
 import org.utbot.cpp.clion.plugin.client.requests.CreateBuildDirRequest
 
-class AskServerToGenerateBuildDir : NotificationAction(UTBot.message("projectConfigure.generate.buildDir")) {
-    override fun actionPerformed(e: AnActionEvent, n: Notification) {
-        actionPerformed(e)
-    }
+class AskServerToGenerateBuildDir : AnAction(UTBot.message("projectConfigure.generate.buildDir")) {
 
-    // todo: add constructor that takes AnActionEvent to Request classes
-    override fun actionPerformed(e: AnActionEvent) {
-        CreateBuildDirRequest(e).execute()
-    }
+    override fun actionPerformed(e: AnActionEvent) = CreateBuildDirRequest(e).execute()
 
     override fun update(e: AnActionEvent) {
         e.presentation.isEnabledAndVisible = e.project != null

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

@@ -1,20 +1,13 @@
 package org.utbot.cpp.clion.plugin.actions
 
-import com.intellij.notification.Notification
-import com.intellij.notification.NotificationAction
+import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import org.utbot.cpp.clion.plugin.UTBot
 import org.utbot.cpp.clion.plugin.client.requests.GenerateJsonFilesRequest
 
-class AskServerToGenerateJsonForProjectConfiguration :
-    NotificationAction(UTBot.message("projectConfigure.generate.json")) {
-    override fun actionPerformed(e: AnActionEvent, n: Notification) {
-        actionPerformed(e)
-    }
+class AskServerToGenerateJsonForProjectConfiguration : AnAction(UTBot.message("projectConfigure.generate.json")) {
 
-    override fun actionPerformed(e: AnActionEvent) {
-        GenerateJsonFilesRequest(e).execute()
-    }
+    override fun actionPerformed(e: AnActionEvent) = GenerateJsonFilesRequest(e).execute()
 
     override fun update(e: AnActionEvent) {
         e.presentation.isEnabledAndVisible = e.project != null

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

@@ -1,23 +1,30 @@
 package org.utbot.cpp.clion.plugin.actions
 
-import com.intellij.notification.Notification
-import com.intellij.notification.NotificationAction
+import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.psi.PsiManager
+import org.utbot.cpp.clion.plugin.utils.activeProject
 import java.nio.file.Path
 
-class FocusAction(val path: Path) : NotificationAction("Show") {
+class FocusAction(val path: Path) : AnAction("Show") {
+
     override fun actionPerformed(e: AnActionEvent) {
-        val virtualFile = LocalFileSystem.getInstance().findFileByNioFile(path) ?: return
+        val virtualFile = LocalFileSystem.getInstance().findFileByNioFile(path)
+            ?: error("Focus action should be disabled for path $path")
+
+        val project = e.activeProject()
+        val projectInstance = PsiManager.getInstance(project)
+
+
         if (virtualFile.isDirectory) {
-            PsiManager.getInstance(e.project!!).findDirectory(virtualFile)?.navigate(true)
+            projectInstance.findDirectory(virtualFile)?.navigate(true)
         } else {
-            PsiManager.getInstance(e.project!!).findFile(virtualFile)?.navigate(true)
+            projectInstance.findFile(virtualFile)?.navigate(true)
         }
     }
 
-    override fun actionPerformed(e: AnActionEvent, notification: Notification) {
-        actionPerformed(e)
+    override fun update(e: AnActionEvent) {
+        e.presentation.isEnabledAndVisible = LocalFileSystem.getInstance().findFileByNioFile(path) != null
     }
 }

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

@@ -1,18 +1,15 @@
 package org.utbot.cpp.clion.plugin.actions
 
-import com.intellij.notification.Notification
-import com.intellij.notification.NotificationAction
+import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import org.utbot.cpp.clion.plugin.UTBot
 import org.utbot.cpp.clion.plugin.ui.wizard.UTBotWizard
+import org.utbot.cpp.clion.plugin.utils.activeProject
 
-class ShowWizardAction: NotificationAction(UTBot.message("wizard.show")) {
-    override fun actionPerformed(e: AnActionEvent, notification: Notification) {
-        actionPerformed(e)
-    }
+class ShowWizardAction: AnAction(UTBot.message("wizard.show")) {
 
     override fun actionPerformed(e: AnActionEvent) {
-        UTBotWizard(e.project ?: return).showAndGet()
+        UTBotWizard(e.activeProject()).showAndGet()
     }
 
     override fun update(e: AnActionEvent) {