From 66295e4897e9dea0a32ffede842a71b00bc439a3 Mon Sep 17 00:00:00 2001
From: Mikhail Filippov <mikhail@filippov.me>
Date: Thu, 8 Jun 2023 01:28:36 +0400
Subject: [PATCH] Move call extension after made all default configuration

We want to have the same behaviour with JavaTestFrameworkRunnableState.createJavaParameters by Anna.Kozlova

GitOrigin-RevId: e91f92dfc0aa8c9a74fd12a8a90877d47224cdec
---
 .../execution/application/ApplicationCommandLineState.java    | 4 +++-
 .../application/BaseJavaApplicationCommandLineState.java      | 2 --
 .../execution/jar/JarApplicationCommandLineState.java         | 1 +
 .../org/jetbrains/kotlin/idea/run/KotlinRunConfiguration.kt   | 1 +
 .../standalone/KotlinStandaloneScriptRunConfiguration.kt      | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationCommandLineState.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationCommandLineState.java
index 65591d9ee863..2eb43606bfe6 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationCommandLineState.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationCommandLineState.java
@@ -38,7 +38,7 @@ public abstract class ApplicationCommandLineState<T extends
     T configuration = getConfiguration();
 
     params.setMainClass(ReadAction.compute(() -> myConfiguration.getRunClass()));
-    setupJavaParameters(params);
+    JavaParametersUtil.configureConfiguration(params, myConfiguration);
 
     final JavaRunConfigurationModule module = myConfiguration.getConfigurationModule();
     ReadAction.run(() -> {
@@ -59,6 +59,8 @@ public abstract class ApplicationCommandLineState<T extends
 
     params.setShortenCommandLine(configuration.getShortenCommandLine(), configuration.getProject());
 
+    setupJavaParameters(params);
+
     return params;
   }
 
diff --git a/java/execution/impl/src/com/intellij/execution/application/BaseJavaApplicationCommandLineState.java b/java/execution/impl/src/com/intellij/execution/application/BaseJavaApplicationCommandLineState.java
index ac5252c55321..ce9c9aca33e6 100644
--- a/java/execution/impl/src/com/intellij/execution/application/BaseJavaApplicationCommandLineState.java
+++ b/java/execution/impl/src/com/intellij/execution/application/BaseJavaApplicationCommandLineState.java
@@ -33,8 +33,6 @@ public abstract class BaseJavaApplicationCommandLineState<T extends RunConfigura
   }
 
   protected void setupJavaParameters(@NotNull JavaParameters params) throws ExecutionException {
-    JavaParametersUtil.configureConfiguration(params, myConfiguration);
-
     ReadAction.run(() -> JavaRunConfigurationExtensionManager.getInstance()
       .updateJavaParameters(getConfiguration(), params, getRunnerSettings(), getEnvironment().getExecutor()));
   }
diff --git a/java/execution/impl/src/com/intellij/execution/jar/JarApplicationCommandLineState.java b/java/execution/impl/src/com/intellij/execution/jar/JarApplicationCommandLineState.java
index b283cdff6f9c..1c10d671fcfb 100644
--- a/java/execution/impl/src/com/intellij/execution/jar/JarApplicationCommandLineState.java
+++ b/java/execution/impl/src/com/intellij/execution/jar/JarApplicationCommandLineState.java
@@ -33,6 +33,7 @@ public class JarApplicationCommandLineState extends BaseJavaApplicationCommandLi
     final JavaParameters params = new JavaParameters();
     final String jreHome = myConfiguration.isAlternativeJrePathEnabled() ? myConfiguration.getAlternativeJrePath() : null;
     params.setJdk(JavaParametersUtil.createProjectJdk(myConfiguration.getProject(), jreHome));
+    JavaParametersUtil.configureConfiguration(params, myConfiguration);
     setupJavaParameters(params);
     params.setJarPath(FileUtil.toSystemDependentName(myConfiguration.getJarPath()));
     return params;
diff --git a/plugins/kotlin/run-configurations/jvm/src/org/jetbrains/kotlin/idea/run/KotlinRunConfiguration.kt b/plugins/kotlin/run-configurations/jvm/src/org/jetbrains/kotlin/idea/run/KotlinRunConfiguration.kt
index f46511463a68..12c35bbd4133 100644
--- a/plugins/kotlin/run-configurations/jvm/src/org/jetbrains/kotlin/idea/run/KotlinRunConfiguration.kt
+++ b/plugins/kotlin/run-configurations/jvm/src/org/jetbrains/kotlin/idea/run/KotlinRunConfiguration.kt
@@ -306,6 +306,7 @@ open class KotlinRunConfiguration(name: String?, runConfigurationModule: JavaRun
                 }
             }
             val jreHome = if (myConfiguration.isAlternativeJrePathEnabled) myConfiguration.alternativeJrePath else null
+            JavaParametersUtil.configureConfiguration(params, myConfiguration)
             runReadAction { JavaParametersUtil.configureModule(module, params, classPathType, jreHome) }
             setupJavaParameters(params)
             params.setShortenCommandLine(myConfiguration.shortenCommandLine, module.project)
diff --git a/plugins/kotlin/run-configurations/jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt b/plugins/kotlin/run-configurations/jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt
index 1729900d1f3f..c790509f5138 100644
--- a/plugins/kotlin/run-configurations/jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt
+++ b/plugins/kotlin/run-configurations/jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt
@@ -200,6 +200,7 @@ private class ScriptCommandLineState(
 
     private fun commonParameters(): JavaParameters {
         val params = JavaParameters()
+        JavaParametersUtil.configureConfiguration(params, myConfiguration)
         setupJavaParameters(params)
         val jreHome = if (configuration.isAlternativeJrePathEnabled) myConfiguration.alternativeJrePath else null
         JavaParametersUtil.configureProject(environment.project, params, JavaParameters.JDK_ONLY, jreHome)