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

ReplaceWithTernaryOperatorFix: method reference scenario as separate class

Browse Source 
Review ID: IDEA-CR-23763
This commit is contained in:
Tagir Valeev
2017-08-23 15:06:04 +07:00
parent 634a1bbc93
commit 6d7d4c9a53
7 changed files with 63 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/ReplaceWithTernaryOperatorFix.java
+57 -34
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2017 JetBrains s.r.o.
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,9 +24,9 @@ import com.intellij.psi.util.PsiTypesUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.refactoring.util.LambdaRefactoringUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.ObjectUtils;
import com.siyeh.ig.psiutils.ParenthesesUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* @author Danila Ponomarenko
@@ -40,8 +40,8 @@ public class ReplaceWithTernaryOperatorFix implements LocalQuickFix {
return InspectionsBundle.message("inspection.replace.ternary.quickfix", myText);
}
public ReplaceWithTernaryOperatorFix(@Nullable PsiExpression expressionToAssert) {
myText = expressionToAssert == null ? "" : ParenthesesUtils.getText(expressionToAssert, ParenthesesUtils.BINARY_AND_PRECEDENCE);
public ReplaceWithTernaryOperatorFix(@NotNull PsiExpression expressionToAssert) {
myText = ParenthesesUtils.getText(expressionToAssert, ParenthesesUtils.BINARY_AND_PRECEDENCE);
}
@NotNull
@@ -53,46 +53,42 @@ public class ReplaceWithTernaryOperatorFix implements LocalQuickFix {
@Override
public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
PsiElement element = descriptor.getPsiElement();
final PsiExpression expression;
String text;
if(element instanceof PsiMethodReferenceExpression) {
PsiLambdaExpression lambda =
LambdaRefactoringUtil.convertMethodReferenceToLambda((PsiMethodReferenceExpression)element, false, true);
if (lambda == null) return;
expression = LambdaUtil.extractSingleExpressionFromBody(lambda.getBody());
if (expression == null) return;
PsiParameter parameter = ArrayUtil.getFirstElement(lambda.getParameterList().getParameters());
if (parameter == null) return;
text = parameter.getName();
} else {
while (true) {
PsiElement parent = element.getParent();
if (parent instanceof PsiReferenceExpression || parent instanceof PsiMethodCallExpression) {
element = parent;
}
else {
break;
}
while (true) {
PsiElement parent = element.getParent();
if (parent instanceof PsiReferenceExpression || parent instanceof PsiMethodCallExpression) {
element = parent;
}
else {
break;
}
if (!(element instanceof PsiExpression)) return;
expression = (PsiExpression)element;
text = myText;
}
final PsiFile file = expression.getContainingFile();
PsiConditionalExpression conditionalExpression = replaceWthConditionalExpression(project, text + "!=null", expression, suggestDefaultValue(expression));
if (!(element instanceof PsiExpression)) {
return;
}
final PsiExpression expression = (PsiExpression)element;
final PsiFile file = expression.getContainingFile();
PsiConditionalExpression conditionalExpression =
replaceWithConditionalExpression(project, myText + "!=null", expression, suggestDefaultValue(expression));
selectElseBranch(file, conditionalExpression);
}
static void selectElseBranch(PsiFile file, PsiConditionalExpression conditionalExpression) {
PsiExpression elseExpression = conditionalExpression.getElseExpression();
if (elseExpression != null) {
((Navigatable)elseExpression).navigate(true);
SelectInEditorManager.getInstance(project).selectInEditor(file.getVirtualFile(), elseExpression.getTextRange().getStartOffset(), elseExpression.getTextRange().getEndOffset(), false, true);
SelectInEditorManager.getInstance(file.getProject())
.selectInEditor(file.getVirtualFile(), elseExpression.getTextRange().getStartOffset(), elseExpression.getTextRange().getEndOffset(),
false, true);
}
}
@NotNull
private static PsiConditionalExpression replaceWthConditionalExpression(@NotNull Project project,
@NotNull String condition,
@NotNull PsiExpression expression,
@NotNull String defaultValue) {
private static PsiConditionalExpression replaceWithConditionalExpression(@NotNull Project project,
@NotNull String condition,
@NotNull PsiExpression expression,
@NotNull String defaultValue) {
final PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory();
final PsiElement parent = expression.getParent();
@@ -117,4 +113,31 @@ public class ReplaceWithTernaryOperatorFix implements LocalQuickFix {
PsiType type = expression.getType();
return PsiTypesUtil.getDefaultValueOfType(type);
}
public static class ReplaceMethodRefWithTernaryOperatorFix implements LocalQuickFix {
@NotNull
@Override
public String getFamilyName() {
return InspectionsBundle.message("inspection.replace.methodref.ternary.quickfix");
}
@Override
public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
PsiMethodReferenceExpression element = ObjectUtils.tryCast(descriptor.getPsiElement(), PsiMethodReferenceExpression.class);
if (element == null) return;
PsiLambdaExpression lambda =
LambdaRefactoringUtil.convertMethodReferenceToLambda(element, false, true);
if (lambda == null) return;
PsiExpression expression = LambdaUtil.extractSingleExpressionFromBody(lambda.getBody());
if (expression == null) return;
PsiParameter parameter = ArrayUtil.getFirstElement(lambda.getParameterList().getParameters());
if (parameter == null) return;
String text = parameter.getName();
final PsiFile file = expression.getContainingFile();
PsiConditionalExpression conditionalExpression = replaceWithConditionalExpression(project, text + "!=null", expression,
suggestDefaultValue(expression));
selectElseBranch(file, conditionalExpression);
}
}
}
java/java-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspection.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class DataFlowInspection extends DataFlowInspectionBase {
protected List<LocalQuickFix> createMethodReferenceNPEFixes(PsiMethodReferenceExpression methodRef) {
List<LocalQuickFix> fixes = new ArrayList<>();
ContainerUtil.addIfNotNull(fixes, StreamFilterNotNullFix.makeFix(methodRef));
fixes.add(new ReplaceWithTernaryOperatorFix(null));
fixes.add(new ReplaceWithTernaryOperatorFix.ReplaceMethodRefWithTernaryOperatorFix());
return fixes;
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithTernaryOperator/afterMethodRefArgument.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with ' != null ?:'" "true"
// "Replace with null-checking lambda" "true"
import java.util.Arrays;
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithTernaryOperator/afterMethodRefQualifier.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with ' != null ?:'" "true"
// "Replace with null-checking lambda" "true"
import java.util.Arrays;
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithTernaryOperator/beforeMethodRefArgument.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with ' != null ?:'" "true"
// "Replace with null-checking lambda" "true"
import java.util.Arrays;
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithTernaryOperator/beforeMethodRefQualifier.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with ' != null ?:'" "true"
// "Replace with null-checking lambda" "true"
import java.util.Arrays;
platform/platform-resources-en/src/messages/InspectionsBundle.properties
+1
View File
@@ -324,6 +324,7 @@ inspection.quickfix.assert.family=Assert
inspection.assert.quickfix=Assert ''{0}''
inspection.surround.if.quickfix=Surround with ''if ({0} != null)''
inspection.replace.ternary.quickfix=Replace with ''{0} != null ?:''
inspection.replace.methodref.ternary.quickfix=Replace with null-checking lambda
inspection.surround.if.family=Surround with if
inspection.dependency.configure.button.text=Configure dependency rules
inspection.surround.requirenonnull.quickfix=Replace with ''Objects.requireNonNull({0})''