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

InlineStreamMapAction: support parenthesized chain

Browse Source
This commit is contained in:
Tagir Valeev
2018-07-06 15:13:12 +07:00
parent 5639829e97
commit b0cc9d68d4
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/intention/impl/InlineStreamMapAction.java
+4 -7
View File
@@ -84,13 +84,10 @@ public class InlineStreamMapAction extends PsiElementBaseIntentionAction {
@Nullable
private static PsiMethodCallExpression getNextExpressionToMerge(PsiMethodCallExpression methodCallExpression) {
PsiElement parent = methodCallExpression.getParent();
if(!(parent instanceof PsiReferenceExpression)) return null;
PsiElement gParent = parent.getParent();
if(!(gParent instanceof PsiMethodCallExpression)) return null;
String nextName = ((PsiReferenceExpression)parent).getReferenceName();
PsiMethodCallExpression nextCall = (PsiMethodCallExpression)gParent;
if(nextName == null || !NEXT_METHODS.contains(nextName) || translateName(methodCallExpression, nextCall) == null) return null;
PsiMethodCallExpression nextCall = ExpressionUtils.getCallForQualifier(methodCallExpression);
if (nextCall == null) return null;
String nextName = nextCall.getMethodExpression().getReferenceName();
if (nextName == null || !NEXT_METHODS.contains(nextName) || translateName(methodCallExpression, nextCall) == null) return null;
PsiExpressionList argumentList = (nextCall).getArgumentList();
PsiExpression[] expressions = argumentList.getExpressions();
if(expressions.length == 0) {
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/inlineStreamMap/beforeMapForEach.java
+1 -1
View File
@@ -3,6 +3,6 @@ import java.util.List;
public class Main {
public static void test(List<CharSequence> list) {
list.stream().map(cs -> cs.subSequence(1, 5)).ma<caret>p(CharSequence::length).forEach(System.out::println);
((list.stream().map(cs -> cs.subSequence(1, 5))).ma<caret>p(CharSequence::length)).forEach(System.out::println);
}
}