MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 17:20:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-typing] IDEA-354366 close braces after switch rule

Browse Source 
GitOrigin-RevId: 057d759e922903ffca05c1ad6c405f4422e90d26
This commit is contained in:
Mikhail Pyltsin
2024-06-25 18:26:57 +02:00
committed by intellij-monorepo-bot
parent 3806438d8a
commit 3b8b3f50f4
4 changed files with 68 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/AbstractBasicJavaTypedHandler.java
View File

@@ -17,13 +17,14 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.impl.source.BasicJavaAstTreeUtil;
import com.intellij.psi.impl.source.BasicJavaElementType;
import com.intellij.psi.tree.ParentAwareTokenSet;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.text.CharArrayUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Set;
import static com.intellij.psi.impl.source.BasicJavaElementType.*;
@@ -119,8 +120,10 @@ public abstract class AbstractBasicJavaTypedHandler extends TypedHandlerDelegate
HighlighterIterator iterator = editor.getHighlighter().createIterator(offset);
CharSequence sequence = editor.getDocument().getCharsSequence();
if (!iterator.atEnd() && iterator.getStart() == offset &&
(iterator.getTokenType() == JavaTokenType.STRING_TEMPLATE_END || iterator.getTokenType() == JavaTokenType.TEXT_BLOCK_TEMPLATE_END ||
iterator.getTokenType() == JavaTokenType.STRING_TEMPLATE_MID || iterator.getTokenType() == JavaTokenType.TEXT_BLOCK_TEMPLATE_MID)) {
(iterator.getTokenType() == JavaTokenType.STRING_TEMPLATE_END ||
iterator.getTokenType() == JavaTokenType.TEXT_BLOCK_TEMPLATE_END ||
iterator.getTokenType() == JavaTokenType.STRING_TEMPLATE_MID ||
iterator.getTokenType() == JavaTokenType.TEXT_BLOCK_TEMPLATE_MID)) {
if (sequence.length() > offset && sequence.charAt(offset) == '}') {
editor.getCaretModel().moveToOffset(offset + 1);
return Result.STOP;
@@ -155,7 +158,8 @@ public abstract class AbstractBasicJavaTypedHandler extends TypedHandlerDelegate
PsiDocumentManager.getInstance(project).commitDocument(doc);
final PsiElement leaf = file.findElementAt(offset);
if (BasicJavaAstTreeUtil.getParentOfType(leaf, BASIC_ARRAY_INITIALIZER_EXPRESSION, false,
ParentAwareTokenSet.orSet(ParentAwareTokenSet.create(BASIC_CODE_BLOCK), MEMBER_SET)) != null) {
ParentAwareTokenSet.orSet(ParentAwareTokenSet.create(BASIC_CODE_BLOCK), MEMBER_SET)) !=
null) {
return Result.CONTINUE;
}
PsiElement st = leaf != null ? leaf.getParent() : null;
@@ -168,6 +172,22 @@ public abstract class AbstractBasicJavaTypedHandler extends TypedHandlerDelegate
return processWhileAndIfStatementBody(project, editor, file);
}
if (CodeInsightSettings.getInstance().AUTOINSERT_PAIR_BRACKET && afterArrowInCase(leaf) &&
iterator.getTokenType() != JavaTokenType.LBRACKET) {
ASTNode rule = BasicJavaAstTreeUtil.getParentOfType(leaf.getNode(), BASIC_SWITCH_LABELED_RULE);
if (rule != null) {
int firstOffset = editor.getCaretModel().getOffset();
editor.getDocument().insertString(firstOffset, "{\n");
editor.getCaretModel().moveToOffset(firstOffset + 1);
int secondOffset = rule.getTextRange().getEndOffset() + 2;
editor.getDocument().insertString(secondOffset, "\n}");
PsiDocumentManager.getInstance(project).commitDocument(editor.getDocument());
CodeStyleManager.getInstance(project).adjustLineIndent(file, secondOffset + 1);
CodeStyleManager.getInstance(project).adjustLineIndent(file, firstOffset + 2);
return Result.STOP;
}
}
if (BasicJavaAstTreeUtil.getParentOfType(leaf, BASIC_CODE_BLOCK, false, MEMBER_SET) != null &&
!shouldInsertPairedBrace(leaf)) {
EditorModificationUtilEx.insertStringAtCaret(editor, "{");
@@ -179,6 +199,22 @@ public abstract class AbstractBasicJavaTypedHandler extends TypedHandlerDelegate
return Result.CONTINUE;
}
private static boolean afterArrowInCase(@Nullable PsiElement leaf) {
if (leaf == null) return false;
PsiElement prevLeaf = PsiTreeUtil.prevVisibleLeaf(leaf);
if (prevLeaf == null) return false;
if (prevLeaf.getNode().getElementType() != JavaTokenType.ARROW) return false;
PsiElement parent = prevLeaf.getParent();
if (parent == null) return false;
if (!BasicJavaAstTreeUtil.is(parent.getNode().getElementType(), BASIC_SWITCH_LABELED_RULE)) return false;
if (StringUtil.isEmptyOrSpaces(leaf.getText())) {
leaf = PsiTreeUtil.nextVisibleLeaf(leaf);
}
PsiElement body = BasicJavaAstTreeUtil.getParentOfType(leaf, Set.of(BASIC_EXPRESSION_STATEMENT, BASIC_THROW_STATEMENT), false);
if (body == null) return false;
return PsiTreeUtil.isAncestor(parent, body, false);
}
private static boolean shouldInsertPairedBrace(@NotNull PsiElement leaf) {
PsiElement prevLeaf = PsiTreeUtil.prevVisibleLeaf(leaf);
// lambda

5
java/java-frontback-tests/testSrc/com/intellij/codeInsight/AbstractBasicJavaTypingTest.java
View File

@@ -175,6 +175,11 @@ public abstract class AbstractBasicJavaTypingTest extends BasePlatformTestCase {
doTest('}');
}
public void testCloseBracesAfterSwitchRule() {
setLanguageLevel(LanguageLevel.JDK_21);
doTest('{');
}
protected void setLanguageLevel(@NotNull LanguageLevel level) {
IdeaTestUtil.setProjectLanguageLevel(getProject(), level, myFixture.getTestRootDisposable());
}

9
java/java-tests/testData/codeInsight/typing/closeBracesAfterSwitchRule_after.java Normal file
View File

@@ -0,0 +1,9 @@
class X {
public static void main(String[] args) {
switch (new Object()){
case Object object ->{<caret>
System.out.println("1");
}
}
}
}

7
java/java-tests/testData/codeInsight/typing/closeBracesAfterSwitchRule_before.java Normal file
View File

@@ -0,0 +1,7 @@
class X {
public static void main(String[] args) {
switch (new Object()){
case Object object -><caret> System.out.println("1");
}
}
}