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] drops value break keyword completion

Browse Source 
GitOrigin-RevId: b713ae661f06245ae400d6aa20ec14d2fa2f20ef
This commit is contained in:
Roman Shevchenko
2019-07-05 01:10:36 +03:00
committed by intellij-monorepo-bot
parent 60e3e2280b
commit 1baaa93702
4 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java
+3 -7
View File
@@ -773,13 +773,9 @@ public class JavaKeywordCompletion {
if (psiElement().inside(PsiSwitchStatement.class).accepts(myPosition)) {
addKeyword(br);
}
else if (psiElement().inside(PsiSwitchExpression.class).accepts(myPosition)) {
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));
}
else if (psiElement().inside(PsiSwitchExpression.class).accepts(myPosition) &&
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)) {
java/java-tests/testData/codeInsight/completion/normal/BreakDeepInsideSwitchExpression.java
+12
View File
@@ -0,0 +1,12 @@
class BreakDeepInsideSwitchExpression {
int test(int i) {
return switch (i) {
default -> {
while (true) {
if (--i < 8) br<caret>
}
yield i;
};
};
}
}
java/java-tests/testData/codeInsight/completion/normal/BreakDeepInsideSwitchExpression_after.java
+12
View File
@@ -0,0 +1,12 @@
class BreakDeepInsideSwitchExpression {
int test(int i) {
return switch (i) {
default -> {
while (true) {
if (--i < 8) break;
}
yield i;
};
};
}
}
java/java-tests/testSrc/com/intellij/java/codeInsight/completion/Normal13CompletionTest.groovy
+1
View File
@@ -21,4 +21,5 @@ class Normal13CompletionTest extends NormalCompletionTestCase {
void testYieldInSwitchExpression() { doTest() }
void testInsideYieldInSwitchExpression() { doTest() }
void testInsideRuleInSwitchExpression() { doTest() }
void testBreakDeepInsideSwitchExpression() { doTest() }
}