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

fix redundant returns deletion in type migration to void

Browse Source
This commit is contained in:
Dmitry Batkovich
2018-06-19 17:51:39 +03:00
parent 11e34f3396
commit b0b3fcb8af
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/MakeVoidQuickFix.java
+1 -1
View File
@@ -121,7 +121,7 @@ public class MakeVoidQuickFix implements LocalQuickFix {
}
if (returnStatement != null && returnStatement.getReturnValue() != null) {
returnStatement.getReturnValue().delete();
if (UnnecessaryReturnInspection.isReturnRedundant(returnStatement, false, null)) {
if (UnnecessaryReturnInspection.isReturnRedundant(returnStatement, false, true, null)) {
returnStatement.delete();
}
}
java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/VoidConversionRule.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class VoidConversionRule extends TypeConversionRule {
final Project project = expression.getProject();
if (parent instanceof PsiReturnStatement) {
final PsiReturnStatement replaced = (PsiReturnStatement)parent.replace(JavaPsiFacade.getElementFactory(project).createStatementFromText("return;", null));
if (UnnecessaryReturnInspection.isReturnRedundant(replaced, false, null)) {
if (UnnecessaryReturnInspection.isReturnRedundant(replaced, false, false, null)) {
DeleteUnnecessaryStatementFix.deleteUnnecessaryStatement(replaced);
}
}
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryReturnInspection.java
+4 -3
View File
@@ -88,7 +88,7 @@ public class UnnecessaryReturnInspection extends BaseInspection {
public void visitReturnStatement(@NotNull PsiReturnStatement statement) {
super.visitReturnStatement(statement);
final Ref<Boolean> constructorRef = Ref.create();
if (isReturnRedundant(statement, ignoreInThenBranch, constructorRef)) {
if (isReturnRedundant(statement, ignoreInThenBranch, true, constructorRef)) {
registerStatementError(statement, constructorRef.get());
}
}
@@ -97,6 +97,7 @@ public class UnnecessaryReturnInspection extends BaseInspection {
public static boolean isReturnRedundant(@NotNull PsiReturnStatement statement,
boolean ignoreInThenBranch,
boolean checkReturnType,
@Nullable Ref<Boolean> isInConstructorRef) {
if (statement.getReturnValue() != null) {
return false;
@@ -109,7 +110,7 @@ public class UnnecessaryReturnInspection extends BaseInspection {
if (isInConstructorRef != null) {
isInConstructorRef.set(method.isConstructor());
}
if (!method.isConstructor() && !PsiType.VOID.equals(method.getReturnType())) {
if (checkReturnType && !method.isConstructor() && !PsiType.VOID.equals(method.getReturnType())) {
return false;
}
}
@@ -118,7 +119,7 @@ public class UnnecessaryReturnInspection extends BaseInspection {
isInConstructorRef.set(false);
}
final PsiLambdaExpression lambdaExpression = (PsiLambdaExpression)methodParent;
if (!PsiType.VOID.equals(LambdaUtil.getFunctionalInterfaceReturnType(lambdaExpression))) {
if (checkReturnType && !PsiType.VOID.equals(LambdaUtil.getFunctionalInterfaceReturnType(lambdaExpression))) {
return false;
}
final PsiElement lambdaBody = lambdaExpression.getBody();