MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-30 02:09:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

allow functional expressions in nested conditional expressions (IDEA-164828)

Browse Source
This commit is contained in:
Anna.Kozlova
2016-12-01 11:40:03 +01:00
parent a8800a9a04
commit 936294e05d
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/java-psi-api/src/com/intellij/psi/LambdaUtil.java
View File

@@ -127,9 +127,17 @@ public class LambdaUtil {
@Contract("null -> false")
public static boolean isValidLambdaContext(@Nullable PsiElement context) {
context = PsiUtil.skipParenthesizedExprUp(context);
return isAssignmentOrInvocationContext(context) ||
context instanceof PsiTypeCastExpression ||
context instanceof PsiConditionalExpression && isAssignmentOrInvocationContext(PsiUtil.skipParenthesizedExprUp(context.getParent()));
if (isAssignmentOrInvocationContext(context) || context instanceof PsiTypeCastExpression) {
return true;
}
if (context instanceof PsiConditionalExpression) {
PsiElement parentContext = PsiUtil.skipParenthesizedExprUp(context.getParent());
if (isAssignmentOrInvocationContext(parentContext)) return true;
if (parentContext instanceof PsiConditionalExpression) {
return isValidLambdaContext(parentContext);
}
}
return false;
}
private static boolean isAssignmentOrInvocationContext(PsiElement context) {

6
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/LambdaContext.java
View File

@@ -27,4 +27,10 @@ class Test1 {
II ik2 = (II)(ik1 = (b ? (s)-> true : (s)->false));
(b ? <error descr="Lambda expression not expected here">(s) -> true</error> : ik)._("");
}
}
class Test2 {
void f() {
final Runnable one=true ? null : true ? () -> {} : () -> {};
}
}