From 79663d926ccac6492a516c4522de2dd0225f7c31 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Thu, 25 Oct 2018 11:24:23 +0200
Subject: [PATCH] ensure --enable-preview is not repeated when user specifies
 it explicitly

---
 .../application/ApplicationCommandLineState.java   |  7 +++----
 .../configurations/JavaParametersTest.java         | 14 +++++++++-----
 2 files changed, 12 insertions(+), 9 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 ef43e5f523cb..fbf61c1cb24f 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationCommandLineState.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationCommandLineState.java
@@ -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;
diff --git a/java/java-tests/testSrc/com/intellij/java/execution/configurations/JavaParametersTest.java b/java/java-tests/testSrc/com/intellij/java/execution/configurations/JavaParametersTest.java
index a240f040c5b3..fb91c5246c5d 100644
--- a/java/java-tests/testSrc/com/intellij/java/execution/configurations/JavaParametersTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/execution/configurations/JavaParametersTest.java
@@ -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));
-  }*/
+  }
 }