From b34433e8fcd4f936c5313d7918303e308662c8bb Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 24 Jun 2019 13:53:26 +0200 Subject: [PATCH] [java] completes 'yield' only at 13-preview or higher (EA-206296) GitOrigin-RevId: caa3c50b85310cb3f697a705887a43696f41c479 --- .../codeInsight/completion/JavaKeywordCompletion.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java index fb2283e2f475..48cfa944fd36 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java @@ -775,9 +775,12 @@ public class JavaKeywordCompletion { addKeyword(br); } else if (psiElement().inside(PsiSwitchExpression.class).accepts(myPosition)) { - addKeyword(TailTypeDecorator.withTail(PsiUtil.getLanguageLevel(myPosition) == LanguageLevel.JDK_12_PREVIEW - ? createKeyword(PsiKeyword.BREAK) - : createKeyword(PsiKeyword.YIELD), TailType.INSERT_SPACE)); + if (PsiUtil.getLanguageLevel(myPosition) == LanguageLevel.JDK_12_PREVIEW) { + addKeyword(TailTypeDecorator.withTail(createKeyword(PsiKeyword.BREAK), TailType.INSERT_SPACE)); + } + else if (PsiUtil.getLanguageLevel(myPosition).isAtLeast(LanguageLevel.JDK_13_PREVIEW)) { + addKeyword(TailTypeDecorator.withTail(createKeyword(PsiKeyword.YIELD), TailType.INSERT_SPACE)); + } } for (PsiLabeledStatement labeled : psiApi().parents(myPosition).takeWhile(notInstanceOf(PsiMember.class)).filter(PsiLabeledStatement.class)) {