From b2f1d73f2144b38557eee39262080aefea16c814 Mon Sep 17 00:00:00 2001 From: Roman Ivanov Date: Mon, 13 Jun 2022 17:39:01 +0200 Subject: [PATCH] highlight when as keyword on language level 19 GitOrigin-RevId: 8df7f515952dfc1560154a3934b11784f6a42b32 --- .../src/com/intellij/lang/java/lexer/JavaLexer.java | 2 +- .../testSrc/com/intellij/java/lexer/JavaKeywordsTest.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 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 80327c7851cd..61bf07ee88b2 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 @@ -41,7 +41,7 @@ public final class JavaLexer extends LexerBase { level.isAtLeast(LanguageLevel.JDK_16) && RECORD.contentEquals(id) || level.isAtLeast(LanguageLevel.JDK_14) && YIELD.contentEquals(id) || (level.isAtLeast(LanguageLevel.JDK_17) && (SEALED.contentEquals(id) || PERMITS.contentEquals(id))) || - level.isAtLeast(LanguageLevel.JDK_X) && WHEN.contentEquals(id) + level.isAtLeast(LanguageLevel.JDK_19_PREVIEW) && WHEN.contentEquals(id) ); } diff --git a/java/java-tests/testSrc/com/intellij/java/lexer/JavaKeywordsTest.kt b/java/java-tests/testSrc/com/intellij/java/lexer/JavaKeywordsTest.kt index 9c60212f3590..1e734cb3d38a 100644 --- a/java/java-tests/testSrc/com/intellij/java/lexer/JavaKeywordsTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/lexer/JavaKeywordsTest.kt @@ -19,8 +19,8 @@ class JavaKeywordsTest { assertTrue(JavaLexer.isSoftKeyword("sealed", LanguageLevel.JDK_17)) assertFalse(JavaLexer.isKeyword("permits", LanguageLevel.JDK_17)) assertTrue(JavaLexer.isSoftKeyword("permits", LanguageLevel.JDK_17)) - assertFalse(JavaLexer.isKeyword("when", LanguageLevel.JDK_X)) - assertTrue(JavaLexer.isSoftKeyword("when", LanguageLevel.JDK_X)) + assertFalse(JavaLexer.isKeyword("when", LanguageLevel.JDK_19_PREVIEW)) + assertTrue(JavaLexer.isSoftKeyword("when", LanguageLevel.JDK_19_PREVIEW)) } @Test fun sequences() {