From 8883bb174a3305e3cb8d1273ec270a47bc27764d Mon Sep 17 00:00:00 2001 From: Semyon Proshev Date: Thu, 27 Oct 2016 20:05:37 +0300 Subject: [PATCH] Minor readability updates in PyReferenceImpl.resolveInner --- .../psi/impl/references/PyReferenceImpl.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/python/src/com/jetbrains/python/psi/impl/references/PyReferenceImpl.java b/python/src/com/jetbrains/python/psi/impl/references/PyReferenceImpl.java index bca772752ed3..c00465c00877 100644 --- a/python/src/com/jetbrains/python/psi/impl/references/PyReferenceImpl.java +++ b/python/src/com/jetbrains/python/psi/impl/references/PyReferenceImpl.java @@ -223,21 +223,16 @@ public class PyReferenceImpl implements PsiReferenceEx, PsiPolyVariantReference */ @NotNull protected List resolveInner() { - final ResolveResultList overriddenRet = resolveByOverridingReferenceResolveProviders(); - if (!overriddenRet.isEmpty()) { - return overriddenRet; + final ResolveResultList overriddenResult = resolveByOverridingReferenceResolveProviders(); + if (!overriddenResult.isEmpty()) { + return overriddenResult; } - final ResolveResultList ret = new ResolveResultList(); - final String referencedName = myElement.getReferencedName(); - if (referencedName == null) return ret; + if (referencedName == null) return Collections.emptyList(); - if (myElement instanceof PyTargetExpression) { - if (PsiTreeUtil.getParentOfType(myElement, PyComprehensionElement.class) != null) { - ret.poke(myElement, getRate(myElement, myContext.getTypeEvalContext())); - return ret; - } + if (myElement instanceof PyTargetExpression && PsiTreeUtil.getParentOfType(myElement, PyComprehensionElement.class) != null) { + return ResolveResultList.to(myElement); } // here we have an unqualified expr. it may be defined: