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

DeleteReturnFix: inlined fix text (IDEA-CR-48700)

Browse Source 
GitOrigin-RevId: 6fadb011645556e4cd421e775f955bb70af9f112
This commit is contained in:
Artemiy Sartakov
2019-07-04 08:02:53 +03:00
committed by intellij-monorepo-bot
parent ff372cbcd7
commit 52aa1ae553
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteReturnFix.java
+8 -13
View File
@@ -7,7 +7,6 @@ import com.intellij.codeInspection.LocalQuickFixAndIntentionActionOnPsiElement;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.refactoring.util.RefactoringUtil;
import com.siyeh.ig.psiutils.CommentTracker;
import com.siyeh.ig.psiutils.ControlFlowUtils;
@@ -24,7 +23,8 @@ public class DeleteReturnFix extends LocalQuickFixAndIntentionActionOnPsiElement
private final SmartPsiElementPointer<PsiReturnStatement> myStatementPtr;
private final SmartPsiElementPointer<PsiExpression> myValuePtr;
private final String myMessage;
private final boolean myIsLastStatement;
private final boolean myHasSideEffects;
public DeleteReturnFix(@NotNull PsiMethod method, @NotNull PsiReturnStatement returnStatement, @NotNull PsiExpression returnValue) {
super(returnStatement);
@@ -32,16 +32,16 @@ public class DeleteReturnFix extends LocalQuickFixAndIntentionActionOnPsiElement
SmartPointerManager manager = SmartPointerManager.getInstance(returnStatement.getProject());
myStatementPtr = manager.createSmartPsiElementPointer(returnStatement);
myValuePtr = manager.createSmartPsiElementPointer(returnValue);
String toDelete = ControlFlowUtils.blockCompletesWithStatement(codeBlock, returnStatement) ? "statement" : "value";
boolean hasSideEffects = SideEffectChecker.mayHaveSideEffects(returnValue);
myMessage = QuickFixBundle.message(hasSideEffects ? "delete.return.fix.side.effects.text" : "delete.return.fix.text", toDelete);
myIsLastStatement = ControlFlowUtils.blockCompletesWithStatement(codeBlock, returnStatement);
myHasSideEffects = SideEffectChecker.mayHaveSideEffects(returnValue);
}
@Nls(capitalization = Nls.Capitalization.Sentence)
@NotNull
@Override
public String getText() {
return myMessage;
String toDelete = myIsLastStatement ? "statement" : "value";
return QuickFixBundle.message(myHasSideEffects ? "delete.return.fix.side.effects.text" : "delete.return.fix.text", toDelete);
}
@Nls(capitalization = Nls.Capitalization.Sentence)
@@ -61,13 +61,8 @@ public class DeleteReturnFix extends LocalQuickFixAndIntentionActionOnPsiElement
if (returnStatement == null) return;
PsiExpression returnValue = myValuePtr.getElement();
if (returnValue == null) return;
PsiMethod method = PsiTreeUtil.getParentOfType(returnStatement, PsiMethod.class, true, PsiLambdaExpression.class);
if (method == null) return;
PsiCodeBlock codeBlock = method.getBody();
if (codeBlock == null) return;
boolean isLastStatement = ControlFlowUtils.blockCompletesWithStatement(codeBlock, returnStatement);
CommentTracker ct = new CommentTracker();
if (SideEffectChecker.mayHaveSideEffects(returnValue)) {
if (myHasSideEffects) {
returnValue = Objects.requireNonNull(RefactoringUtil.ensureCodeBlock(returnValue));
returnStatement = (PsiReturnStatement)returnValue.getParent();
}
@@ -75,7 +70,7 @@ public class DeleteReturnFix extends LocalQuickFixAndIntentionActionOnPsiElement
sideEffects.forEach(ct::markUnchanged);
PsiStatement[] statements = StatementExtractor.generateStatements(sideEffects, returnValue);
if (statements.length > 0) BlockUtils.addBefore(returnStatement, statements);
PsiElement toDelete = isLastStatement ? returnStatement : returnValue;
PsiElement toDelete = myIsLastStatement ? returnStatement : returnValue;
ct.deleteAndRestoreComments(toDelete);
}
}