mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
skip parenthesis exprs
This commit is contained in:
+2
-2
@@ -95,7 +95,7 @@ public class StaticImportMethodFix implements IntentionAction {
|
||||
private PsiType getExpectedType() {
|
||||
final PsiMethodCallExpression methodCall = myMethodCall.getElement();
|
||||
if (methodCall == null) return null;
|
||||
final PsiElement parent = methodCall.getParent();
|
||||
final PsiElement parent = PsiResolveHelperImpl.skipParenthesizedExprUp(methodCall.getParent());
|
||||
|
||||
if (parent instanceof PsiVariable) {
|
||||
if (methodCall.equals(PsiResolveHelperImpl.skipParenthesizedExprDown(((PsiVariable)parent).getInitializer()))) {
|
||||
@@ -126,7 +126,7 @@ public class StaticImportMethodFix implements IntentionAction {
|
||||
final PsiElement psiElement = resolveResult.getElement();
|
||||
if (psiElement instanceof PsiMethod) {
|
||||
final PsiParameter[] parameters = ((PsiMethod)psiElement).getParameterList().getParameters();
|
||||
final int idx = ArrayUtilRt.find(((PsiExpressionList)parent).getExpressions(), methodCall);
|
||||
final int idx = ArrayUtilRt.find(((PsiExpressionList)parent).getExpressions(), PsiResolveHelperImpl.skipParenthesizedExprUp(methodCall));
|
||||
return idx > -1 ? resolveResult.getSubstitutor().substitute(parameters[idx].getType()) : null;
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -1054,7 +1054,7 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
|
||||
return initializer;
|
||||
}
|
||||
|
||||
private static PsiElement skipParenthesizedExprUp(PsiElement parent) {
|
||||
public static PsiElement skipParenthesizedExprUp(PsiElement parent) {
|
||||
while (parent instanceof PsiParenthesizedExpression) {
|
||||
parent = parent.getParent();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user