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

IDEA-235296 Refactor ensureCodeBlock: TrivialFunctionalExpressionUsageInspection updated

Browse Source 
GitOrigin-RevId: 4f92ab7fe8c79e22dc17479e172330e5c61332b7
This commit is contained in:
Tagir Valeev
2020-03-17 20:53:55 +00:00
committed by intellij-monorepo-bot
parent 1dea41a567
commit ec7cd902e8
7 changed files with 56 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/trivialFunctionalExpressionUsage/afterBlockLambdaForInit.java
+12
View File
@@ -0,0 +1,12 @@
// "Replace method call on lambda with lambda body" "true"
public class Main {
public static void main(String[] args) {
int i = 0;
System.out.println("Hello");
System.out.println("World");
for (; i < 10; ) {
System.out.println(i++);
}
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/trivialFunctionalExpressionUsage/afterBlockLambdaInFieldDeclaration.java
+11
View File
@@ -0,0 +1,11 @@
// "Replace method call on lambda with lambda body" "true"
import java.util.function.Supplier;
class Test {
String str;
{
String s = "";
str = s;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/trivialFunctionalExpressionUsage/afterBlockLambdaWhileStatement.java
+13
View File
@@ -0,0 +1,13 @@
// "Replace method call on lambda with lambda body" "true"
import java.util.function.Predicate;
public class Test {
public static void main(String[] args) {
while(true) {
System.out.println("hello");
if (!Collections.singleton("abc").contains("ab")) break;
System.out.println("hello");
}
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/trivialFunctionalExpressionUsage/beforeBlockLambdaForInit.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace method call on lambda with lambda body" "false"
// "Replace method call on lambda with lambda body" "true"
public class Main {
public static void main(String[] args) {
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/trivialFunctionalExpressionUsage/beforeBlockLambdaInFieldDeclaration.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace method call on lambda with lambda body" "false"
// "Replace method call on lambda with lambda body" "true"
import java.util.function.Supplier;
class Test {
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/trivialFunctionalExpressionUsage/beforeBlockLambdaWhileStatement.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace method call on lambda with lambda body" "false"
// "Replace method call on lambda with lambda body" "true"
import java.util.function.Predicate;
plugins/InspectionGadgets/src/com/intellij/codeInspection/TrivialFunctionalExpressionUsageInspection.java
+17 -31
View File
@@ -11,7 +11,6 @@ import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.refactoring.util.InlineUtil;
import com.intellij.refactoring.util.LambdaRefactoringUtil;
import com.intellij.refactoring.util.RefactoringUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.ObjectUtils;
import com.siyeh.InspectionGadgetsBundle;
@@ -66,23 +65,9 @@ public class TrivialFunctionalExpressionUsageInspection extends AbstractBaseJava
if (!(ArrayUtil.getLastElement(statements) instanceof PsiReturnStatement)) {
return false;
}
if (returnStatements[0].getReturnValue() != null) {
if (callParent instanceof PsiLocalVariable) {
return true;
}
}
}
if(callParent instanceof PsiExpressionStatement) {
PsiElement statementParent = callParent.getParent();
// Disable in "for" initialization or update
if(statementParent instanceof PsiForStatement && callParent != ((PsiForStatement)statementParent).getBody()) {
return false;
}
}
return (callParent instanceof PsiStatement && !(callParent instanceof PsiLoopStatement)) ||
callParent instanceof PsiLambdaExpression;
return CodeBlockSurrounder.canSurround(call);
};
Predicate<PsiMethodCallExpression> checkWrites = call ->
Arrays.stream(expression.getParameterList().getParameters())
@@ -166,8 +151,9 @@ public class TrivialFunctionalExpressionUsageInspection extends AbstractBaseJava
PsiExpression[] arguments = callExpression.getArgumentList().getExpressions();
if (Stream.of(arguments).noneMatch(SideEffectChecker::mayHaveSideEffects)) return lambda;
lambda = RefactoringUtil.ensureCodeBlock(lambda);
if (lambda == null) return null;
CodeBlockSurrounder surrounder = CodeBlockSurrounder.forExpression(lambda);
if (surrounder == null) return null;
lambda = (PsiLambdaExpression)surrounder.surround().getExpression();
callExpression = PsiTreeUtil.getParentOfType(lambda, PsiMethodCallExpression.class);
if (callExpression == null) return lambda;
arguments = callExpression.getArgumentList().getExpressions();
@@ -210,8 +196,10 @@ public class TrivialFunctionalExpressionUsageInspection extends AbstractBaseJava
}
private static void replaceCodeBlock(PsiLambdaExpression element) {
element = RefactoringUtil.ensureCodeBlock(element);
if (element == null) return;
CodeBlockSurrounder surrounder = CodeBlockSurrounder.forExpression(element);
if (surrounder == null) return;
CodeBlockSurrounder.SurroundResult result = surrounder.surround();
element = (PsiLambdaExpression)result.getExpression();
PsiElement body = element.getBody();
if (!(body instanceof PsiCodeBlock)) return;
PsiMethodCallExpression callExpression = PsiTreeUtil.getParentOfType(element, PsiMethodCallExpression.class);
@@ -223,18 +211,16 @@ public class TrivialFunctionalExpressionUsageInspection extends AbstractBaseJava
final PsiStatement[] statements = ((PsiCodeBlock)body).getStatements();
PsiReturnStatement statement = null;
if (statements.length > 0) {
PsiElement anchor = PsiTreeUtil.getParentOfType(parent, PsiStatement.class, false);
PsiElement anchor = result.getAnchor();
statement = ObjectUtils.tryCast(statements[statements.length - 1], PsiReturnStatement.class);
if (anchor != null) {
PsiElement gParent = anchor.getParent();
if (hasNameConflict(statements, anchor, element)) {
gParent.addBefore(JavaPsiFacade.getElementFactory(element.getProject()).createStatementFromText(ct.text(body), anchor), anchor);
}
else {
for (PsiElement child = body.getFirstChild(); child != null; child = child.getNextSibling()) {
if (child != statement && !(child instanceof PsiJavaToken)) {
gParent.addBefore(ct.markUnchanged(child), anchor);
}
PsiElement gParent = anchor.getParent();
if (hasNameConflict(statements, anchor, element)) {
gParent.addBefore(JavaPsiFacade.getElementFactory(element.getProject()).createStatementFromText(ct.text(body), anchor), anchor);
}
else {
for (PsiElement child = body.getFirstChild(); child != null; child = child.getNextSibling()) {
if (child != statement && !(child instanceof PsiJavaToken)) {
gParent.addBefore(ct.markUnchanged(child), anchor);
}
}
}