From af80b1afd177e78eb58b03cca1ea514e125b0291 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Fri, 7 Mar 2025 12:29:21 +0100 Subject: [PATCH] [java-completion] SemicolonFixer: cosmetic GitOrigin-RevId: 4cf39ca29f402fad784fde227676a4139b849c41 --- .../editorActions/smartEnter/SemicolonFixer.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SemicolonFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SemicolonFixer.java index 69d9071622a1..ed2ea144fc5b 100644 --- a/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SemicolonFixer.java +++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SemicolonFixer.java @@ -13,15 +13,12 @@ import org.jetbrains.annotations.Nullable; public class SemicolonFixer extends AbstractBasicSemicolonFixer { @Override protected boolean fixReturn(@NotNull Editor editor, @Nullable PsiElement psiElement) { - if (psiElement instanceof PsiReturnStatement) { + if (psiElement instanceof PsiReturnStatement stmt) { PsiMethod method = PsiTreeUtil.getParentOfType(psiElement, PsiMethod.class, true, PsiLambdaExpression.class); - if (method != null && PsiTypes.voidType().equals(method.getReturnType())) { - PsiReturnStatement stmt = (PsiReturnStatement)psiElement; - if (stmt.getReturnValue() != null) { - Document doc = editor.getDocument(); - doc.insertString(stmt.getTextRange().getStartOffset() + "return".length(), ";"); - return true; - } + if (method != null && PsiTypes.voidType().equals(method.getReturnType()) && stmt.getReturnValue() != null) { + Document doc = editor.getDocument(); + doc.insertString(stmt.getTextRange().getStartOffset() + "return".length(), ";"); + return true; } } return false;