From 6265b2386b025ea3dfdad65ba22e75700c486e3e Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 9 Jul 2013 14:06:00 +0400 Subject: [PATCH] EA-47054 - assert: PsiScopesUtil.setupAndRunProcessor --- .../src/com/intellij/psi/scope/util/PsiScopesUtil.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java b/java/java-psi-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java index 46036ea6e6ff..9faf2c3e3738 100644 --- a/java/java-psi-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java +++ b/java/java-psi-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java @@ -131,9 +131,7 @@ public class PsiScopesUtil { } else if (type instanceof PsiDisjunctionType) { final PsiType lub = ((PsiDisjunctionType)type).getLeastUpperBound(); - if (lub != null) { - processTypeDeclarations(lub, place, processor); - } + processTypeDeclarations(lub, place, processor); } else { final JavaResolveResult result = PsiUtil.resolveGenericsClassInType(type); @@ -307,7 +305,10 @@ public class PsiScopesUtil { final PsiElement referenceName = methodCall.getMethodExpression().getReferenceNameElement(); final PsiManager manager = call.getManager(); final PsiElement qualifier = ref.getQualifier(); - + if (referenceName == null) { + // e.g. "manager.(beginTransaction)" + throw new MethodProcessorSetupFailedException("Can't resolve method name for this expression"); + } if (referenceName instanceof PsiIdentifier && qualifier instanceof PsiExpression) { PsiType type = ((PsiExpression)qualifier).getType(); if (type != null && qualifier instanceof PsiReferenceExpression) {