MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-intentions] IDEA-299327 'Merge filter chain' quick-fix produces uncompilable code when lambda contains return

Browse Source 
GitOrigin-RevId: 1e8d17520a03629891549385727b62e0bd342500
This commit is contained in:
Tagir Valeev
2022-08-04 17:47:30 +02:00
committed by intellij-monorepo-bot
parent c01bbb5413
commit 41d70528b5
3 changed files with 44 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
java/java-impl/src/com/intellij/codeInsight/intention/impl/MergeFilterChainAction.java
View File

@@ -147,21 +147,19 @@ public class MergeFilterChainAction extends PsiElementBaseIntentionAction {
PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
PsiElement nameElement = callToStay.getMethodExpression().getReferenceNameElement();
LOG.assertTrue(nameElement != null);
if(!resultingOperation.equals(nameElement.getText())) {
if (!resultingOperation.equals(nameElement.getText())) {
nameElement.replace(factory.createIdentifier(resultingOperation));
}
PsiElement targetBody = targetLambda.getBody();
LOG.assertTrue(targetBody instanceof PsiExpression);
final PsiElement sourceLambdaBody = sourceLambda.getBody();
PsiExpression targetBody = LambdaUtil.extractSingleExpressionFromBody(targetLambda.getBody());
LOG.assertTrue(targetBody != null);
final PsiExpression sourceLambdaBody = LambdaUtil.extractSingleExpressionFromBody(sourceLambda.getBody());
LOG.assertTrue(sourceLambdaBody != null);
LOG.assertTrue(sourceLambdaBody instanceof PsiExpression);
final PsiExpression compoundExpression = factory
.createExpressionFromText(
ParenthesesUtils.getText((PsiExpression)targetBody, ParenthesesUtils.OR_PRECEDENCE) + " && " +
ParenthesesUtils.getText((PsiExpression)sourceLambdaBody, ParenthesesUtils.OR_PRECEDENCE), sourceLambda);
targetBody = targetBody.replace(compoundExpression);
String newFilter = ParenthesesUtils.getText(targetBody, ParenthesesUtils.OR_PRECEDENCE) + " && " +
ParenthesesUtils.getText(sourceLambdaBody, ParenthesesUtils.OR_PRECEDENCE);
final PsiExpression compoundExpression = factory.createExpressionFromText(newFilter, sourceLambda);
targetBody = (PsiExpression)targetBody.replace(compoundExpression);
CodeStyleManager.getInstance(project).reformat(targetBody);
final PsiExpression qualifierExpression = callToEliminate.getMethodExpression().getQualifierExpression();

16
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeFilter/afterLambdaWithReturn.java Normal file
View File

@@ -0,0 +1,16 @@
// "Merge filter chain" "true-preview"
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
class StreamFilter {
List<Integer> calc(Stream<Integer> stream) {
return stream
.filter(chain -> chain.doubleValue() > 12 && shouldReport(chain))
.collect(Collectors.toList());
}
private boolean shouldReport(Integer chain1) {
return false;
}
}

19
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeFilter/beforeLambdaWithReturn.java Normal file
View File

@@ -0,0 +1,19 @@
// "Merge filter chain" "true-preview"
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
class StreamFilter {
List<Integer> calc(Stream<Integer> stream) {
return stream
.<caret>filter(chain -> chain.doubleValue() > 12)
.filter(chain1 -> {
return shouldReport(chain1);
})
.collect(Collectors.toList());
}
private boolean shouldReport(Integer chain1) {
return false;
}
}