MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

ensure --enable-preview is not repeated when user specifies it explicitly

Browse Source
This commit is contained in:
Anna.Kozlova
2018-10-25 11:25:41 +02:00
parent 14ba0b4057
commit 79663d926c
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/application/ApplicationCommandLineState.java
+3 -4
View File
@@ -43,6 +43,9 @@ public abstract class ApplicationCommandLineState<T extends
T configuration = getConfiguration();
params.setShortenCommandLine(configuration.getShortenCommandLine(), configuration.getProject());
params.setMainClass(myConfiguration.getRunClass());
setupJavaParameters(params);
final JavaRunConfigurationModule module = myConfiguration.getConfigurationModule();
final String jreHome = myConfiguration.isAlternativeJrePathEnabled() ? myConfiguration.getAlternativeJrePath() : null;
if (module.getModule() != null) {
@@ -56,10 +59,6 @@ public abstract class ApplicationCommandLineState<T extends
JavaParametersUtil.configureProject(module.getProject(), params, JavaParameters.JDK_AND_CLASSES_AND_TESTS, jreHome);
}
params.setMainClass(myConfiguration.getRunClass());
setupJavaParameters(params);
setupModulePath(params, module);
return params;
java/java-tests/testSrc/com/intellij/java/execution/configurations/JavaParametersTest.java
+9 -5
View File
@@ -6,9 +6,13 @@ import com.intellij.execution.configurations.JavaParameters;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.DependencyScope;
import com.intellij.openapi.roots.LanguageLevelModuleExtension;
import com.intellij.openapi.roots.ModuleRootModificationUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.roots.ModuleRootManagerTestCase;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.util.lang.JavaVersion;
import org.intellij.lang.annotations.MagicConstant;
/**
@@ -107,20 +111,20 @@ public class JavaParametersTest extends ModuleRootManagerTestCase {
assertRoots(javaParameters.getClassPath(), roots);
}
/*public void testPreviewLanguageFeatures() throws CantRunException {
public void testPreviewLanguageFeatures() throws CantRunException {
ModuleRootModificationUtil.updateModel(myModule, (model) -> {
model.getModuleExtension(LanguageLevelModuleExtension.class)
.setLanguageLevel(LanguageLevel.JDK_11_PREVIEW);
model.setSdk(IdeaTestUtil.getMockJdk(JavaVersion.compose(11)));
.setLanguageLevel(LanguageLevel.JDK_12_PREVIEW);
model.setSdk(IdeaTestUtil.getMockJdk(JavaVersion.compose(12)));
});
JavaParameters javaParameters = new JavaParameters();
javaParameters.configureByModule(myModule, JavaParameters.CLASSES_AND_TESTS);
assertTrue(javaParameters.getVMParametersList().hasParameter(JavaParameters.JAVA_ENABLE_PREVIEW_PROPERTY));
ModuleRootModificationUtil.updateModel(myModule, (model) -> model.getModuleExtension(LanguageLevelModuleExtension.class)
.setLanguageLevel(LanguageLevel.JDK_11));
.setLanguageLevel(LanguageLevel.JDK_12));
javaParameters = new JavaParameters();
javaParameters.configureByModule(myModule, JavaParameters.CLASSES_AND_TESTS);
assertFalse(javaParameters.getVMParametersList().hasParameter(JavaParameters.JAVA_ENABLE_PREVIEW_PROPERTY));
}*/
}
}