little UI impovements: combined logs and targets tool windows into one, removed verbose widget (#456)

vol0n · web-flow · commit 80106ddedc85 · 2022-09-23T12:31:06.000+03:00
* initial

* Fix wrong notification type when build folder not created
diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/ChangeVerboseModeAction.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/ChangeVerboseModeAction.kt
@@ -0,0 +1,49 @@
+package org.utbot.cpp.clion.plugin.actions
+
+import com.intellij.openapi.actionSystem.ActionPlaces
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.CommonDataKeys
+import com.intellij.openapi.actionSystem.ToggleAction
+import com.intellij.openapi.project.Project
+import org.utbot.cpp.clion.plugin.UTBot
+import org.utbot.cpp.clion.plugin.settings.settings
+
+class ChangeVerboseModeAction : ToggleAction() {
+    override fun isSelected(e: AnActionEvent): Boolean {
+        updateActionText(e)
+        return e.getRequiredData(CommonDataKeys.PROJECT).settings.storedSettings.verbose
+    }
+
+    override fun isDumbAware(): Boolean = true
+
+    override fun update(e: AnActionEvent) {
+        super.update(e)
+        e.presentation.isEnabledAndVisible = (e.project != null)
+    }
+
+    override fun setSelected(e: AnActionEvent, state: Boolean) {
+        with(e.getRequiredData(CommonDataKeys.PROJECT).settings) {
+            storedSettings.verbose = state
+            fireUTBotSettingsChanged()
+        }
+        updateActionText(e)
+    }
+
+    private fun updateActionText(e: AnActionEvent) {
+        e.presentation.text = getActionText(e.getRequiredData(CommonDataKeys.PROJECT), e.place)
+    }
+
+    companion object {
+        private fun getActionText(project: Project, place: String? = null): String {
+            val isVerboseEnabled = project.settings.storedSettings.verbose
+            var newText = if (isVerboseEnabled) UTBot.message("actions.verbose.enabled")
+            else UTBot.message("actions.verbose.disabled")
+            if (place != null && ActionPlaces.isPopupPlace(place)) {
+                newText = if (isVerboseEnabled)
+                    UTBot.message("actions.verbose.menu.enabled")
+                else UTBot.message("actions.verbose.menu.disabled")
+            }
+            return newText
+        }
+    }
+}
diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/RefreshTargetsAction.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/RefreshTargetsAction.kt
@@ -4,7 +4,7 @@ import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.components.service
-import org.utbot.cpp.clion.plugin.ui.targetsToolWindow.UTBotTargetsController
+import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.targetToolWindow.UTBotTargetsController
 import org.utbot.cpp.clion.plugin.utils.activeProject
 
 class RefreshTargetsAction: AnAction() {
diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/channels/GTestLogChannelImpl.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/channels/GTestLogChannelImpl.kt
@@ -6,7 +6,7 @@ import kotlinx.coroutines.flow.Flow
 import org.utbot.cpp.clion.plugin.grpc.getDummyGrpcRequest
 import org.utbot.cpp.clion.plugin.grpc.getLogChannelGrpcRequest
 import org.utbot.cpp.clion.plugin.ui.services.OutputProvider
-import org.utbot.cpp.clion.plugin.ui.userLog.UTBotConsole
+import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.logsToolWindow.UTBotConsole
 import testsgen.Testgen
 import testsgen.TestsGenServiceGrpcKt
 
diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/channels/LogChannelImpl.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/channels/LogChannelImpl.kt
@@ -4,7 +4,7 @@ import com.intellij.openapi.project.Project
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.collect
-import org.utbot.cpp.clion.plugin.ui.userLog.UTBotConsole
+import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.logsToolWindow.UTBotConsole
 import org.utbot.cpp.clion.plugin.utils.invokeOnEdt
 import org.utbot.cpp.clion.plugin.utils.logger
 import testsgen.Testgen
diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/channels/ServerLogChannelImpl.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/channels/ServerLogChannelImpl.kt
@@ -6,7 +6,7 @@ import kotlinx.coroutines.flow.Flow
 import org.utbot.cpp.clion.plugin.grpc.getDummyGrpcRequest
 import org.utbot.cpp.clion.plugin.grpc.getLogChannelGrpcRequest
 import org.utbot.cpp.clion.plugin.ui.services.OutputProvider
-import org.utbot.cpp.clion.plugin.ui.userLog.UTBotConsole
+import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.logsToolWindow.UTBotConsole
 import testsgen.Testgen
 import testsgen.TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub
 
diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/handlers/ProjectConfigurationHandler.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/handlers/ProjectConfigurationHandler.kt
@@ -94,7 +94,7 @@ class CreateBuildDirHandler(
                 }
             }
             Testgen.ProjectConfigStatus.BUILD_DIR_CREATION_FAILED -> {
-                notifyInfo("Failed to create build directory! ${response.message}", project)
+                notifyError("Failed to create build directory! ${response.message}", project)
             }
             else -> notifyUnknownResponse(response, project)
         }
diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/settings/UTBotAllProjectSettings.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/settings/UTBotAllProjectSettings.kt
@@ -3,12 +3,10 @@ package org.utbot.cpp.clion.plugin.settings
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
-import com.jetbrains.cidr.cpp.execution.CMakeAppRunConfiguration
 import org.utbot.cpp.clion.plugin.listeners.UTBotSettingsChangedListener
-import org.utbot.cpp.clion.plugin.ui.targetsToolWindow.UTBotTarget
+import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.targetToolWindow.UTBotTarget
 import org.utbot.cpp.clion.plugin.utils.convertToRemotePathIfNeeded
 import org.utbot.cpp.clion.plugin.utils.isWindows
-import org.utbot.cpp.clion.plugin.utils.notifyWarning
 import org.utbot.cpp.clion.plugin.utils.path
 import java.io.File
 import java.nio.file.Path
diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/settings/UTBotProjectStoredSettings.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/settings/UTBotProjectStoredSettings.kt
@@ -6,8 +6,8 @@ import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
-import org.utbot.cpp.clion.plugin.ui.targetsToolWindow.UTBotTarget
-import org.utbot.cpp.clion.plugin.ui.targetsToolWindow.UTBotTargetsController
+import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.targetToolWindow.UTBotTarget
+import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.targetToolWindow.UTBotTargetsController
 import org.utbot.cpp.clion.plugin.utils.path
 import java.nio.file.Paths
 
diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/services/OutputProvider.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/services/OutputProvider.kt
@@ -9,14 +9,14 @@ import com.intellij.openapi.util.Disposer
 import com.intellij.util.ui.JBUI
 import com.intellij.util.ui.components.BorderLayoutPanel
 import org.utbot.cpp.clion.plugin.client.logger.LogLevel
-import org.utbot.cpp.clion.plugin.ui.userLog.OutputType
-import org.utbot.cpp.clion.plugin.ui.userLog.UTBotConsole
 import org.utbot.cpp.clion.plugin.utils.logger
 import java.awt.BorderLayout
 import java.awt.Component
 import java.awt.GridLayout
 import java.awt.event.ItemEvent
 import javax.swing.JPanel
+import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.logsToolWindow.OutputType
+import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.logsToolWindow.UTBotConsole
 
 @Service
 class OutputProvider(val project: Project) : Disposable {
@@ -65,4 +65,4 @@ class OutputProvider(val project: Project) : Disposable {
             }
         }
     }
-}
+}
diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/statusBar/StatusBarConnectionStatus.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/statusBar/StatusBarConnectionStatus.kt
@@ -2,8 +2,11 @@ package org.utbot.cpp.clion.plugin.ui.statusBar
 
 import com.intellij.ide.DataManager
 import com.intellij.openapi.actionSystem.ActionPlaces
+import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.actionSystem.DefaultActionGroup
+import com.intellij.openapi.options.ShowSettingsUtil
+import com.intellij.openapi.project.DumbAwareAction
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.popup.JBPopupFactory
 import com.intellij.openapi.ui.popup.ListPopup
@@ -12,12 +15,15 @@ import com.intellij.openapi.wm.StatusBarWidget
 import com.intellij.openapi.wm.StatusBarWidgetFactory
 import com.intellij.ui.awt.RelativePoint
 import com.intellij.util.Consumer
+import org.utbot.cpp.clion.plugin.UTBot
+import org.utbot.cpp.clion.plugin.actions.ChangeVerboseModeAction
 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
 import org.utbot.cpp.clion.plugin.listeners.ConnectionStatus
 import org.utbot.cpp.clion.plugin.listeners.UTBotEventsListener
+import org.utbot.cpp.clion.plugin.settings.UTBotConfigurable
 import org.utbot.cpp.clion.plugin.utils.projectLifetimeDisposable
 import java.awt.Component
 import java.awt.Point
@@ -100,6 +106,16 @@ object StatusBarActionsPopup {
                 ActionPlaces.POPUP
             )
     }
+    private object ShortcutSettingsAction : DumbAwareAction(UTBot.message("actions.settings.text")) {
+        override fun actionPerformed(e: AnActionEvent) {
+            ShowSettingsUtil.getInstance().showSettingsDialog(e.project, UTBotConfigurable::class.java)
+        }
+
+        override fun update(e: AnActionEvent) {
+            super.update(e)
+            e.presentation.isEnabledAndVisible = e.project != null
+        }
+    }
 
     private fun getActions(): DefaultActionGroup {
         val actionGroup = DefaultActionGroup()
@@ -109,9 +125,13 @@ object StatusBarActionsPopup {
         actionGroup.addSeparator()
         actionGroup.add(ConfigureProjectAction())
         actionGroup.addSeparator()
+        actionGroup.add(ShortcutSettingsAction)
+        actionGroup.addSeparator()
         actionGroup.add(ReconnectAction())
         actionGroup.addSeparator()
         actionGroup.addAction(ReconfigureProjectAction())
+        actionGroup.addSeparator()
+        actionGroup.add(ChangeVerboseModeAction())
 
         return actionGroup
     }
diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/statusBar/UTBotStatusBarVerboseWidget.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/statusBar/UTBotStatusBarVerboseWidget.kt
diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/statusBar/VerboseModeWidgetFactory.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/statusBar/VerboseModeWidgetFactory.kt
diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/targetsToolWindow/UTBotTargetsToolWindowFactory.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/targetsToolWindow/UTBotTargetsToolWindowFactory.kt
diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/userLog/ConsoleToolWindowProvider.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/userLog/ConsoleToolWindowProvider.kt
diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/UTBotToolWindowFactory.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/UTBotToolWindowFactory.kt
@@ -0,0 +1,27 @@
+package org.utbot.cpp.clion.plugin.ui.utbotToolWindow
+
+import com.intellij.openapi.components.service
+import com.intellij.openapi.diagnostic.Logger
+import com.intellij.openapi.project.DumbAware
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.wm.ToolWindow
+import com.intellij.openapi.wm.ToolWindowFactory
+import org.utbot.cpp.clion.plugin.UTBot
+import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.logsToolWindow.ConsoleToolWindow
+import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.targetToolWindow.UTBotTargetsController
+
+class UTBotToolWindowFactory : ToolWindowFactory, DumbAware {
+    private val logger = Logger.getInstance(this::class.java)
+
+    override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
+        logger.info("createToolWindowContent was called")
+        val contentManager = toolWindow.contentManager
+        val targetsToolWindow = contentManager.factory.createContent(
+            project.service<UTBotTargetsController>().targetsToolWindow, UTBot.message("toolwindow.targets.displayName"), false
+        )
+        val logsToolWindow =
+            contentManager.factory.createContent(ConsoleToolWindow(project), UTBot.message("toolwindow.logs.displayName"), false)
+        toolWindow.contentManager.addContent(logsToolWindow)
+        toolWindow.contentManager.addContent(targetsToolWindow)
+    }
+}
diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/logsToolWindow/ConsoleToolWindow.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/logsToolWindow/ConsoleToolWindow.kt
@@ -1,4 +1,4 @@
-package org.utbot.cpp.clion.plugin.ui.userLog
+package org.utbot.cpp.clion.plugin.ui.utbotToolWindow.logsToolWindow
 
 import com.intellij.execution.impl.ConsoleViewImpl
 import com.intellij.execution.ui.ConsoleViewContentType
diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/targetToolWindow/UTBotTarget.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/targetToolWindow/UTBotTarget.kt
@@ -1,4 +1,4 @@
-package org.utbot.cpp.clion.plugin.ui.targetsToolWindow
+package org.utbot.cpp.clion.plugin.ui.utbotToolWindow.targetToolWindow
 
 import com.intellij.openapi.project.Project
 import org.utbot.cpp.clion.plugin.utils.convertFromRemotePathIfNeeded
@@ -22,4 +22,4 @@ data class UTBotTarget(val path: String, val name: String, val description: Stri
             description = "Finds any target that contains the code under test"
         )
     }
-}
+}
diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/targetToolWindow/UTBotTargetsController.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/targetToolWindow/UTBotTargetsController.kt
@@ -1,4 +1,4 @@
-package org.utbot.cpp.clion.plugin.ui.targetsToolWindow
+package org.utbot.cpp.clion.plugin.ui.utbotToolWindow.targetToolWindow
 
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.project.Project
diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/targetToolWindow/UTBotTargetsToolWindow.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/targetToolWindow/UTBotTargetsToolWindow.kt
@@ -1,4 +1,4 @@
-package org.utbot.cpp.clion.plugin.ui.targetsToolWindow
+package org.utbot.cpp.clion.plugin.ui.utbotToolWindow.targetToolWindow
 
 import com.intellij.openapi.actionSystem.ActionGroup
 import com.intellij.openapi.actionSystem.ActionManager
@@ -16,8 +16,6 @@ import javax.swing.JList
 import javax.swing.ListSelectionModel
 import org.utbot.cpp.clion.plugin.UTBot
 import org.utbot.cpp.clion.plugin.actions.RefreshTargetsAction
-import org.utbot.cpp.clion.plugin.utils.invokeOnEdt
-import org.utbot.cpp.clion.plugin.utils.logger
 
 class UTBotTargetsToolWindow(
     listModel: CollectionListModel<UTBotTarget>,
diff --git a/clion-plugin/src/main/resources/META-INF/plugin.xml b/clion-plugin/src/main/resources/META-INF/plugin.xml
diff --git a/clion-plugin/src/main/resources/messages/UTBot.properties b/clion-plugin/src/main/resources/messages/UTBot.properties
diff --git a/clion-plugin/src/test/kotlin/org/utbot/cpp/clion/plugin/BaseGenerationTestCase.kt b/clion-plugin/src/test/kotlin/org/utbot/cpp/clion/plugin/BaseGenerationTestCase.kt

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ class CreateBuildDirHandler(`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`Testgen.ProjectConfigStatus.BUILD_DIR_CREATION_FAILED -> {`
`97`		`- notifyInfo("Failed to create build directory! ${response.message}", project)`
	`97`	`+ notifyError("Failed to create build directory! ${response.message}", project)`
`98`	`98`	`}`
`99`	`99`	`else -> notifyUnknownResponse(response, project)`
`100`	`100`	`}`