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

[java] adds "13" and "13-preview" language levels; maps text blocks to the latter (IDEA-215312)

Browse Source 
GitOrigin-RevId: 38b0eb1deb6ea7d6d9646b0683858be4bd2ce4e6
This commit is contained in:
Roman Shevchenko
2019-06-08 14:08:14 +03:00
committed by intellij-monorepo-bot
parent 67a166a8c6
commit ccfadedd24
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+1 -1
View File
@@ -3096,7 +3096,7 @@ public class HighlightUtil extends HighlightUtilBase {
MODULES(LanguageLevel.JDK_1_9, "feature.modules"),
ENHANCED_SWITCH(LanguageLevel.JDK_12_PREVIEW, "feature.enhanced.switch"),
SWITCH_EXPRESSION(LanguageLevel.JDK_12_PREVIEW, "feature.switch.expressions"),
TEXT_BLOCKS(LanguageLevel.JDK_X, "feature.text.blocks"),
TEXT_BLOCKS(LanguageLevel.JDK_13_PREVIEW, "feature.text.blocks"),
RAW_LITERALS(LanguageLevel.JDK_X, "feature.raw.literals");
private final LanguageLevel level;
java/java-psi-api/src/com/intellij/openapi/projectRoots/JavaSdkVersion.java
+3 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.projectRoots;
import com.intellij.pom.java.LanguageLevel;
@@ -27,7 +27,8 @@ public enum JavaSdkVersion {
JDK_1_9(LanguageLevel.JDK_1_9),
JDK_10(LanguageLevel.JDK_10),
JDK_11(LanguageLevel.JDK_11),
JDK_12(LanguageLevel.JDK_12);
JDK_12(LanguageLevel.JDK_12),
JDK_13(LanguageLevel.JDK_13);
private final LanguageLevel myMaxLanguageLevel;
java/java-psi-api/src/com/intellij/pom/java/LanguageLevel.java
+3 -1
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.pom.java;
import com.intellij.core.JavaCoreBundle;
@@ -32,6 +32,8 @@ public enum LanguageLevel {
JDK_11(JavaCoreBundle.message("jdk.11.language.level.description"), 11),
JDK_12(JavaCoreBundle.message("jdk.12.language.level.description"), 12),
JDK_12_PREVIEW(JavaCoreBundle.message("jdk.12.preview.language.level.description"), 12),
JDK_13(JavaCoreBundle.message("jdk.13.language.level.description"), 13),
JDK_13_PREVIEW(JavaCoreBundle.message("jdk.13.preview.language.level.description"), 13),
JDK_X(JavaCoreBundle.message("jdk.X.language.level.description"), 12);
public static final LanguageLevel HIGHEST = JDK_12;
java/java-psi-api/src/messages/JavaCoreBundle.properties
+2
View File
@@ -12,4 +12,6 @@ jdk.10.language.level.description=10 - Local variable type inference
jdk.11.language.level.description=11 - Local variable syntax for lambda parameters
jdk.12.language.level.description=12 - No new language features
jdk.12.preview.language.level.description=12 (Preview) - Switch expressions
jdk.13.language.level.description=13 - No new language features
jdk.13.preview.language.level.description=13 (Preview) - Text blocks
jdk.X.language.level.description=X - Experimental features