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

lambda: skip parenthesis exprs

Browse Source
This commit is contained in:
anna
2013-02-21 18:26:23 +01:00
parent d0f4f864d8
commit 9ab097b11d
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/GraphInferencePolicy.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class GraphInferencePolicy extends ProcessCandidateParameterTypeInference
}
public static void forget(PsiElement parent) {
if (parent instanceof PsiCallExpression) {
if (parent instanceof PsiExpression) {
final PsiElement gParent = parent.getParent();
if (gParent instanceof PsiExpressionList) {
final PsiElement ggParent = gParent.getParent();
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/ProcessCandidateParameterTypeInferencePolicy.java
+5
View File
@@ -43,6 +43,11 @@ public class ProcessCandidateParameterTypeInferencePolicy extends DefaultParamet
PsiCallExpression contextCall,
PsiTypeParameter typeParameter) {
PsiExpression[] expressions = expressionList.getExpressions();
PsiElement parent = innerMethodCall.getParent();
while (parent instanceof PsiParenthesizedExpression) {
innerMethodCall = (PsiExpression)parent;
parent = parent.getParent();
}
int i = ArrayUtil.find(expressions, innerMethodCall);
if (i < 0) return null;
PsiMethod owner = (PsiMethod)typeParameter.getOwner();
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java
+6 -1
View File
@@ -1073,7 +1073,12 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
expectedType = ((PsiTypeCastExpression)parent).getType();
} else if (parent instanceof PsiConditionalExpression) {
if (PsiUtil.isLanguageLevel8OrHigher(parent)) {
return inferMethodTypeParameterFromParent(parent.getParent(), (PsiExpression)parent, typeParameter, substitutor, policy);
try {
return inferMethodTypeParameterFromParent(PsiUtil.skipParenthesizedExprUp(parent.getParent()), (PsiExpression)parent, typeParameter, substitutor, policy);
}
finally {
GraphInferencePolicy.forget(parent);
}
}
}