diff --git a/platform/execution-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java b/platform/execution-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java index fd57bd3fb57d..8dfaf6febf95 100644 --- a/platform/execution-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java +++ b/platform/execution-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java @@ -387,7 +387,7 @@ public final class ChooseRunConfigurationPopup implements ExecutorProvider { final RunManager manager = RunManager.getInstance(project); - if (!manager.isRunWidgetActive()) RunManager.getInstance(project).setSelectedConfiguration(config); + if (!manager.isRiderRunWidgetActive()) RunManager.getInstance(project).setSelectedConfiguration(config); MacroManager.getInstance().cacheMacrosPreview(context); ExecutionUtil.doRunConfiguration(config, executor, null, null, context); } @@ -634,7 +634,7 @@ public final class ChooseRunConfigurationPopup implements ExecutorProvider { if (dynamic) { manager.setTemporaryConfiguration(settings); } - if (!manager.isRunWidgetActive()) manager.setSelectedConfiguration(settings); + if (!manager.isRiderRunWidgetActive()) manager.setSelectedConfiguration(settings); ExecutionUtil.runConfiguration(settings, executor); } }); diff --git a/platform/execution-impl/src/com/intellij/execution/impl/RunManagerImpl.kt b/platform/execution-impl/src/com/intellij/execution/impl/RunManagerImpl.kt index 321c9443c2ad..9682b3b42fca 100644 --- a/platform/execution-impl/src/com/intellij/execution/impl/RunManagerImpl.kt +++ b/platform/execution-impl/src/com/intellij/execution/impl/RunManagerImpl.kt @@ -245,10 +245,10 @@ open class RunManagerImpl @JvmOverloads constructor(val project: Project, shared } override fun shouldSetRunConfigurationFromContext(): Boolean { - return Registry.`is`("select.run.configuration.from.context") && !isRunWidgetActive() + return Registry.`is`("select.run.configuration.from.context") && !isRiderRunWidgetActive() } - override fun isRunWidgetActive(): Boolean { + override fun isRiderRunWidgetActive(): Boolean { return RunToolbarSlotManager.getInstance(project).active } diff --git a/platform/execution/src/com/intellij/execution/RunManager.kt b/platform/execution/src/com/intellij/execution/RunManager.kt index 4d092068718d..5ac6762f3989 100644 --- a/platform/execution/src/com/intellij/execution/RunManager.kt +++ b/platform/execution/src/com/intellij/execution/RunManager.kt @@ -133,7 +133,7 @@ abstract class RunManager { */ abstract fun shouldSetRunConfigurationFromContext(): Boolean - abstract fun isRunWidgetActive(): Boolean + abstract fun isRiderRunWidgetActive(): Boolean /** * Creates a configuration of the specified type with the specified name. Note that you need to call diff --git a/platform/execution/src/com/intellij/execution/runToolbar/RunToolbarProcessData.kt b/platform/execution/src/com/intellij/execution/runToolbar/RunToolbarProcessData.kt index ec84de660173..62ace8f5031a 100644 --- a/platform/execution/src/com/intellij/execution/runToolbar/RunToolbarProcessData.kt +++ b/platform/execution/src/com/intellij/execution/runToolbar/RunToolbarProcessData.kt @@ -39,7 +39,7 @@ class RunToolbarProcessData { fun prepareSuppressMainSlotCustomization(project: Project, addition: Consumer? = null): Consumer { return Consumer { ee: ExecutionEnvironment -> val runManager = getInstance(project) - if (runManager.isRunWidgetActive()) { + if (runManager.isRiderRunWidgetActive()) { ee.putUserData(RUN_TOOLBAR_SUPPRESS_MAIN_SLOT_USER_DATA_KEY, true) } } diff --git a/platform/testFramework/src/com/intellij/mock/MockRunManager.kt b/platform/testFramework/src/com/intellij/mock/MockRunManager.kt index b981c02d49fd..15cc32560816 100644 --- a/platform/testFramework/src/com/intellij/mock/MockRunManager.kt +++ b/platform/testFramework/src/com/intellij/mock/MockRunManager.kt @@ -40,7 +40,7 @@ class MockRunManager : RunManagerEx() { return true } - override fun isRunWidgetActive(): Boolean { + override fun isRiderRunWidgetActive(): Boolean { return false }