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

remove JAVA_11_PREVIEW completely from the code

Browse Source
This commit is contained in:
Anna Kozlova
2018-06-08 15:21:32 +03:00
parent d2e2e0b3e8
commit abd6791e53
6 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LanguageLevelCombo.java
View File

@@ -26,7 +26,6 @@ public abstract class LanguageLevelCombo extends ComboBox<Object> {
public LanguageLevelCombo(String defaultItem) {
myDefaultItem = defaultItem;
for (LanguageLevel level : LanguageLevel.values()) {
if (level.isPreview()) continue;
addItem(level);
}

1
java/java-psi-api/src/com/intellij/pom/java/LanguageLevel.java
View File

@@ -30,7 +30,6 @@ public enum LanguageLevel {
JDK_1_9(JavaCoreBundle.message("jdk.1.9.language.level.description"), 9),
JDK_10(JavaCoreBundle.message("jdk.10.language.level.description"), 10),
JDK_11(JavaCoreBundle.message("jdk.11.language.level.description"), 11),
JDK_11_PREVIEW(JavaCoreBundle.message("jdk.11.preview.language.level.description"), 11),
JDK_X(JavaCoreBundle.message("jdk.X.language.level.description"), 12);
public static final LanguageLevel HIGHEST = JDK_10;

1
java/java-psi-api/src/messages/JavaCoreBundle.properties
View File

@@ -10,5 +10,4 @@ jdk.1.8.language.level.description=8 - Lambdas, type annotations etc.
jdk.1.9.language.level.description=9 - Modules, private methods in interfaces etc.
jdk.10.language.level.description=10 - Local variable type inference
jdk.11.language.level.description=11 - Local variable syntax for lambda parameters
jdk.11.preview.language.level.description=11-preview -
jdk.X.language.level.description=X - Experimental features

8
java/java-tests/testSrc/com/intellij/java/execution/configurations/JavaParametersTest.java
View File

@@ -6,13 +6,9 @@ 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;
/**
@@ -111,7 +107,7 @@ 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);
@@ -126,5 +122,5 @@ public class JavaParametersTest extends ModuleRootManagerTestCase {
javaParameters = new JavaParameters();
javaParameters.configureByModule(myModule, JavaParameters.CLASSES_AND_TESTS);
assertFalse(javaParameters.getVMParametersList().hasParameter(JavaParameters.JAVA_ENABLE_PREVIEW_PROPERTY));
}
}*/
}

2
java/java-tests/testSrc/com/intellij/java/openapi/projectRoots/JavaSdkVersionTest.java
View File

@@ -15,7 +15,7 @@ public class JavaSdkVersionTest {
assertEquals(JavaSdkVersion.JDK_1_6, JavaSdkVersion.fromLanguageLevel(LanguageLevel.JDK_1_6));
assertEquals(JavaSdkVersion.JDK_1_8, JavaSdkVersion.fromLanguageLevel(LanguageLevel.JDK_1_8));
assertEquals(JavaSdkVersion.JDK_11, JavaSdkVersion.fromLanguageLevel(LanguageLevel.JDK_11));
assertEquals(JavaSdkVersion.JDK_11, JavaSdkVersion.fromLanguageLevel(LanguageLevel.JDK_11_PREVIEW));
//assertEquals(JavaSdkVersion.JDK_11, JavaSdkVersion.fromLanguageLevel(LanguageLevel.JDK_11_PREVIEW));
}
@Test

2
jps/model-api/src/org/jetbrains/jps/model/java/LanguageLevel.java
View File

@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
* @author nik
*/
public enum LanguageLevel {
JDK_1_3(3), JDK_1_4(4), JDK_1_5(5), JDK_1_6(6), JDK_1_7(7), JDK_1_8(8), JDK_1_9(9), JDK_10(10), JDK_11(11), JDK_11_PREVIEW(11), JDK_X(12);
JDK_1_3(3), JDK_1_4(4), JDK_1_5(5), JDK_1_6(6), JDK_1_7(7), JDK_1_8(8), JDK_1_9(9), JDK_10(10), JDK_11(11), JDK_X(12);
private final JavaVersion myVersion;