Get rid of internal API usage

turbanoff · Nov 14, 2024 · 0b57250 · 0b57250
1 parent f68d42e
commit 0b57250
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
   <id>org.turbanov.run.configuration.as.action</id>
   <name>Run Configuration as Action</name>
-  <version>3.0</version>
+  <version>3.1</version>
   <vendor email="turbanoff@gmail.com" url="https://github.com/turbanoff/RunConfigurationAsAction">Turbanov Andrey</vendor>
 
   <description><![CDATA[
@@ -11,6 +11,10 @@ Also, it allows to create button in toolbar to run specific configuration.<br>
     ]]></description>
 
   <change-notes><![CDATA[
+    <h3>3.1</h3>
+      <ul>
+        <li>Get rid of internal API usage</li>
+      </ul>
     <h3>3.0</h3>
       <ul>
         <li>Require 2023.x to be able to use new API</li>

diff --git a/src/org/turbanov/actions/RunConfigurationAsAction.java b/src/org/turbanov/actions/RunConfigurationAsAction.java
@@ -9,7 +9,6 @@
 import com.intellij.execution.ExecutionTargetManager;
 import com.intellij.execution.Executor;
 import com.intellij.execution.ExecutorRegistry;
-import com.intellij.execution.ExecutorRegistryImpl;
 import com.intellij.execution.RunManagerEx;
 import com.intellij.execution.RunnerAndConfigurationSettings;
 import com.intellij.execution.compound.CompoundRunConfiguration;
@@ -75,15 +74,27 @@ public void actionPerformed(@NotNull AnActionEvent e) {
             MacroManager.getInstance().cacheMacrosPreview(e.getDataContext());
         }
 
-        // Copy of 'com.intellij.execution.ExecutorRegistryImpl.RunnerHelper.runSubProcess'
+        runSubProcess(e.getDataContext(), runConfig, project, runManager, executor, target);
+    }
+
+    // Copy of 'com.intellij.execution.ExecutorRegistryImpl.RunnerHelper.runSubProcess'
+    private static void runSubProcess(DataContext dataContext,
+                                      RunnerAndConfigurationSettings runConfig,
+                                      Project project,
+                                      RunManagerEx runManager,
+                                      Executor executor,
+                                      ExecutionTarget target)
+    {
         RunConfiguration configuration = runConfig.getConfiguration();
-        DataContext dataContext = e.getDataContext();
 
         if (configuration instanceof CompoundRunConfiguration) {
             for (SettingsAndEffectiveTarget settingsAndEffectiveTarget : ((CompoundRunConfiguration) configuration)
                     .getConfigurationsWithEffectiveRunTargets()) {
                 RunConfiguration subConfiguration = settingsAndEffectiveTarget.getConfiguration();
-                ExecutorRegistryImpl.RunnerHelper.run(project, subConfiguration, runManager.findSettings(subConfiguration), dataContext, executor);
+                RunnerAndConfigurationSettings settings = runManager.findSettings(subConfiguration);
+                if (settings != null) {
+                    runSubProcess(dataContext, settings, project, runManager, executor, target);
+                }
             }
         } else {
             ExecutionEnvironmentBuilder builder = ExecutionEnvironmentBuilder.createOrNull(executor, runConfig);