From bd79ee1b7218f5b822c1c44e5fdadfdff4d2f73e Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Wed, 16 Dec 2020 10:24:33 +0100 Subject: [PATCH] java ll 16: ensure sealed is not available for 16 (no preview), make records available for 16 IJ-CR-4644 GitOrigin-RevId: 388e8abdc5e3be33f19dccbc54d335b0038919a2 --- .../src/com/intellij/lang/java/lexer/JavaLexer.java | 2 +- .../src/com/intellij/lang/java/parser/DeclarationParser.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/lang/java/lexer/JavaLexer.java b/java/java-psi-impl/src/com/intellij/lang/java/lexer/JavaLexer.java index 385d328505ae..b771724eacbe 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/lexer/JavaLexer.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/lexer/JavaLexer.java @@ -40,7 +40,7 @@ public final class JavaLexer extends LexerBase { level.isAtLeast(LanguageLevel.JDK_10) && VAR.contentEquals(id) || level.isAtLeast(LanguageLevel.JDK_15_PREVIEW) && RECORD.contentEquals(id) || level.isAtLeast(LanguageLevel.JDK_14) && YIELD.contentEquals(id) || - (level.isAtLeast(LanguageLevel.JDK_15_PREVIEW) && (SEALED.contentEquals(id) || PERMITS.contentEquals(id)))); + (level.isAtLeast(LanguageLevel.JDK_15_PREVIEW) && (level == LanguageLevel.JDK_X || level.isPreview()) && (SEALED.contentEquals(id) || PERMITS.contentEquals(id)))); } private final _JavaLexer myFlexLexer; diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java index a8e9a6f7116a..e9e4fbe32a36 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java @@ -419,7 +419,7 @@ public class DeclarationParser { if (tokenType == JavaTokenType.IDENTIFIER && PsiKeyword.RECORD.equals(builder.getTokenText()) && builder.lookAhead(1) == JavaTokenType.IDENTIFIER) { LanguageLevel level = getLanguageLevel(builder); - return level.isAtLeast(LanguageLevel.JDK_15_PREVIEW) && (level == LanguageLevel.JDK_X || level.isPreview()); + return level.isAtLeast(LanguageLevel.JDK_15_PREVIEW); } return false; }