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-impl] IDEA-262315 Complete current statement doesn't work for switch expression

Browse Source 
GitOrigin-RevId: c755b2eb3a30a8011ea665f13effc7224594818b
This commit is contained in:
Tagir Valeev
2021-02-18 08:51:53 +00:00
committed by intellij-monorepo-bot
parent 12fc73a9d2
commit 0ee0388653
4 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java
+7 -5
View File
@@ -281,11 +281,13 @@ public class JavaSmartEnterProcessor extends SmartEnterProcessor {
if (atCaret instanceof PsiWhiteSpace) return null;
if (atCaret instanceof PsiJavaToken && "}".equals(atCaret.getText())) {
atCaret = atCaret.getParent();
if (!(atCaret instanceof PsiAnonymousClass ||
atCaret instanceof PsiArrayInitializerExpression ||
psiElement(PsiCodeBlock.class).withParent(PsiLambdaExpression.class).accepts(atCaret))) {
return null;
}
boolean expressionEndingWithBrace = atCaret instanceof PsiAnonymousClass ||
atCaret instanceof PsiArrayInitializerExpression ||
atCaret instanceof PsiCodeBlock && (
atCaret.getParent() instanceof PsiLambdaExpression ||
atCaret.getParent() instanceof PsiSwitchExpression
);
if (!expressionEndingWithBrace) return null;
}
for (PsiElement each : SyntaxTraverser.psiApi().parents(atCaret).skip(1)) {
java/java-tests/testData/codeInsight/completeStatement/SemicolonAfterSwitchExpression.java
+9
View File
@@ -0,0 +1,9 @@
public class SemicolonAfterSwitchExpression {
void test() {
int x = switch(0) {
case 0 -> 1;
case 1 -> 2;
default -> 3;
}<caret>
}
}
java/java-tests/testData/codeInsight/completeStatement/SemicolonAfterSwitchExpression_after.java
+9
View File
@@ -0,0 +1,9 @@
public class SemicolonAfterSwitchExpression {
void test() {
int x = switch (0) {
case 0 -> 1;
case 1 -> 2;
default -> 3;
};
}
}
java/java-tests/testSrc/com/intellij/java/codeInsight/CompleteStatementTest.java
+1
View File
@@ -182,6 +182,7 @@ public class CompleteStatementTest extends EditorActionTestCase {
public void testRecordWithComponent() { doTest(); }
public void testRecordWithComponentNoBody() { doTest(); }
public void testVarargMethod() { doTest(); }
public void testSemicolonAfterSwitchExpression() { doTest(); }
private void doTestBracesNextLineStyle() {
myJavaSettings.BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE;