MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Move call extension after made all default configuration

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

GitOrigin-RevId: e91f92dfc0aa8c9a74fd12a8a90877d47224cdec
This commit is contained in:
Mikhail Filippov
2023-06-08 01:28:36 +04:00
committed by intellij-monorepo-bot
parent e25f2d162d
commit 66295e4897
5 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/execution/impl/src/com/intellij/execution/application/ApplicationCommandLineState.java
View File

@@ -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;
}

2
java/execution/impl/src/com/intellij/execution/application/BaseJavaApplicationCommandLineState.java
View File

@@ -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()));
}

1
java/execution/impl/src/com/intellij/execution/jar/JarApplicationCommandLineState.java
View File

@@ -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;