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 new file mode 100644 index 00000000..1408a1d8 --- /dev/null +++ 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 index 6aea2395..5825c536 100644 --- 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 index 2b00adf9..64e81260 100644 --- 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 index dc5a1d03..fdf97f23 100644 --- 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 index 4c9f9fb9..77b8714d 100644 --- 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 index 2e7f671f..c9ca2835 100644 --- 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 index d44cd101..b3294c0b 100644 --- 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 index 2118f1fd..5b4ab2b7 100644 --- 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 index 1130d11d..5a767555 100644 --- 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 { } } } -} \ No newline at end of file +} 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 index 32af7da2..69ef19f8 100644 --- 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 deleted file mode 100644 index 483d60e9..00000000 --- a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/statusBar/UTBotStatusBarVerboseWidget.kt +++ /dev/null @@ -1,52 +0,0 @@ -package org.utbot.cpp.clion.plugin.ui.statusBar - -import com.intellij.openapi.wm.StatusBar -import com.intellij.openapi.wm.StatusBarWidget -import com.intellij.util.Consumer -import org.utbot.cpp.clion.plugin.listeners.UTBotSettingsChangedListener -import org.utbot.cpp.clion.plugin.settings.settings -import org.utbot.cpp.clion.plugin.utils.projectLifetimeDisposable -import java.awt.Component -import java.awt.event.MouseEvent - -class UTBotStatusBarVerboseWidget : StatusBarWidget, StatusBarWidget.TextPresentation { - private var statusBar: StatusBar? = null - - override fun ID(): String = WIDGET_ID - - override fun install(statusbar: StatusBar) { - this.statusBar = statusbar - statusBar?.updateWidget(ID()) - statusbar.project?.let { project -> - project.messageBus.connect(project.projectLifetimeDisposable) - .subscribe(UTBotSettingsChangedListener.TOPIC, UTBotSettingsChangedListener { - statusbar.updateWidget(ID()) - }) - } - } - - override fun dispose() {} - - override fun getTooltipText() = VerboseModeWidgetFactory.STATUS_BAR_DISPLAY_NAME - - override fun getClickConsumer() = Consumer { _ -> - val project = statusBar?.project ?: return@Consumer - val settings = project.settings.storedSettings - settings.verbose = !settings.verbose - statusBar?.updateWidget(ID()) - } - - override fun getText(): String { - val project = statusBar?.project ?: return "" - return if (project.settings.storedSettings.verbose) "✔ UTBot: verbose formatting" else "❌ UTBot: verbose formatting" - } - - - override fun getAlignment(): Float = Component.CENTER_ALIGNMENT - - override fun getPresentation(): StatusBarWidget.WidgetPresentation = this - - companion object { - val WIDGET_ID: String = UTBotStatusBarVerboseWidget::class.java.name - } -} 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 deleted file mode 100644 index 2719f8ea..00000000 --- a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/statusBar/VerboseModeWidgetFactory.kt +++ /dev/null @@ -1,25 +0,0 @@ -package org.utbot.cpp.clion.plugin.ui.statusBar - -import com.intellij.openapi.project.Project -import com.intellij.openapi.wm.StatusBar -import com.intellij.openapi.wm.StatusBarWidget -import com.intellij.openapi.wm.StatusBarWidgetFactory - -class VerboseModeWidgetFactory : StatusBarWidgetFactory { - override fun getId() = STATUS_BAR_ID - - override fun getDisplayName() = STATUS_BAR_DISPLAY_NAME - - override fun isAvailable(project: Project): Boolean = true - - override fun createWidget(project: Project): StatusBarWidget = UTBotStatusBarVerboseWidget() - - override fun disposeWidget(widget: StatusBarWidget) {} - - override fun canBeEnabledOn(statusBar: StatusBar): Boolean = statusBar.project != null - - companion object { - const val STATUS_BAR_ID = "UTBot: verbose mode" - const val STATUS_BAR_DISPLAY_NAME = "UTBot: Verbose Formatting" - } -} \ No newline at end of file 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 deleted file mode 100644 index 380b6935..00000000 --- a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/targetsToolWindow/UTBotTargetsToolWindowFactory.kt +++ /dev/null @@ -1,20 +0,0 @@ -package org.utbot.cpp.clion.plugin.ui.targetsToolWindow - -import com.intellij.openapi.components.service -import com.intellij.openapi.diagnostic.Logger -import com.intellij.openapi.project.Project -import com.intellij.openapi.wm.ToolWindow -import com.intellij.openapi.wm.ToolWindowFactory - -class UTBotTargetsToolWindowFactory : ToolWindowFactory { - 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 content = contentManager.factory.createContent( - project.service().targetsToolWindow, null, false - ) - toolWindow.contentManager.addContent(content) - } -} 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 deleted file mode 100644 index a05322a5..00000000 --- a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/userLog/ConsoleToolWindowProvider.kt +++ /dev/null @@ -1,19 +0,0 @@ -package org.utbot.cpp.clion.plugin.ui.userLog - -import com.intellij.openapi.diagnostic.Logger -import com.intellij.openapi.project.Project -import com.intellij.openapi.wm.ToolWindow -import com.intellij.openapi.wm.ToolWindowFactory - -class ConsoleToolWindowProvider : ToolWindowFactory { - private val logger = Logger.getInstance(this::class.java) - - override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) { - logger.debug("createToolWindowContent was called") - - val contentManager = toolWindow.contentManager - val content = - contentManager.factory.createContent(ConsoleToolWindow(project), null, false) - contentManager.addContent(content) - } -} \ No newline at end of file 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 new file mode 100644 index 00000000..cfb32566 --- /dev/null +++ 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().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/userLog/ConsoleToolWindow.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/logsToolWindow/ConsoleToolWindow.kt similarity index 94% rename from clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/userLog/ConsoleToolWindow.kt rename to clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/logsToolWindow/ConsoleToolWindow.kt index 61a3164c..5072e995 100644 --- a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/userLog/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/targetsToolWindow/UTBotTarget.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/targetToolWindow/UTBotTarget.kt similarity index 91% rename from clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/targetsToolWindow/UTBotTarget.kt rename to clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/targetToolWindow/UTBotTarget.kt index 9d900953..585ceca1 100644 --- a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/targetsToolWindow/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" ) } -} \ No newline at end of file +} diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/targetsToolWindow/UTBotTargetsController.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/targetToolWindow/UTBotTargetsController.kt similarity index 98% rename from clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/targetsToolWindow/UTBotTargetsController.kt rename to clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/targetToolWindow/UTBotTargetsController.kt index 066ee0cc..b8b3a7e5 100644 --- a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/targetsToolWindow/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/targetsToolWindow/UTBotTargetsToolWindow.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/targetToolWindow/UTBotTargetsToolWindow.kt similarity index 94% rename from clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/targetsToolWindow/UTBotTargetsToolWindow.kt rename to clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/targetToolWindow/UTBotTargetsToolWindow.kt index 55e759ba..40498fc1 100644 --- a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/targetsToolWindow/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, diff --git a/clion-plugin/src/main/resources/META-INF/plugin.xml b/clion-plugin/src/main/resources/META-INF/plugin.xml index 40ab8b8c..c9dc050a 100644 --- a/clion-plugin/src/main/resources/META-INF/plugin.xml +++ b/clion-plugin/src/main/resources/META-INF/plugin.xml @@ -27,17 +27,12 @@ - + - - + factoryClass="org.utbot.cpp.clion.plugin.ui.utbotToolWindow.UTBotToolWindowFactory"/> @@ -199,5 +194,10 @@ + + + diff --git a/clion-plugin/src/main/resources/messages/UTBot.properties b/clion-plugin/src/main/resources/messages/UTBot.properties index 08eb7e1c..affcbbea 100644 --- a/clion-plugin/src/main/resources/messages/UTBot.properties +++ b/clion-plugin/src/main/resources/messages/UTBot.properties @@ -51,3 +51,13 @@ 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. Learn more 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. +toolwindow.targets.displayName=Targets +toolwindow.logs.displayName=Logs +actions.verbose.menu.enabled=Verbose Mode: On +actions.verbose.menu.disabled=Verbose Mode: Off +actions.verbose.enabled=UTBot: Verbose Mode: Enabled +actions.verbose.disabled=UTBot: Verbose Mode: Enable +actions.settings.text=Settings... +notification.title=UTBot +notification.buildir.missing.title=UTBot: Build Directory not Found +notification.wrong.config=UTBot: Project not Configured 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 index 59bd34f5..a266206b 100644 --- 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 @@ -15,7 +15,7 @@ import org.junit.jupiter.api.extension.ExtendWith import org.utbot.cpp.clion.plugin.client.Client import org.utbot.cpp.clion.plugin.client.logger.SystemWriter import org.utbot.cpp.clion.plugin.settings.settings -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.getCurrentClient import org.utbot.cpp.clion.plugin.utils.logger import java.io.File