Fixed regression in resolving 'namedtuple' members

This commit is contained in:
Andrey Vlasovskikh
2013-04-25 17:34:56 +04:00
parent 3c1271b0a1
commit ae574867ac
2 changed files with 5 additions and 4 deletions
@@ -41,12 +41,14 @@ public class PyNamedTupleType extends PyClassTypeImpl implements PyCallableType
myDefinitionLevel = definitionLevel;
}
@Nullable
@Override
public List<? extends RatedResolveResult> resolveMember(@NotNull String name,
@Nullable PyExpression location,
@NotNull AccessDirection direction,
@NotNull PyResolveContext resolveContext) {
final List<? extends RatedResolveResult> classMembers = super.resolveMember(name, location, direction, resolveContext);
@NotNull PyResolveContext resolveContext,
boolean inherited) {
final List<? extends RatedResolveResult> classMembers = super.resolveMember(name, location, direction, resolveContext, inherited);
if (classMembers != null && !classMembers.isEmpty()) {
return classMembers;
}
@@ -71,8 +71,7 @@ public class PyQualifiedReference extends PyReferenceImpl {
qualifierType.assertValid("qualifier: " + qualifier);
// resolve within the type proper
AccessDirection ctx = AccessDirection.of(myElement);
final List<? extends RatedResolveResult> membersOfQualifier = qualifierType.resolveMember(referencedName, qualifier, ctx, myContext
);
final List<? extends RatedResolveResult> membersOfQualifier = qualifierType.resolveMember(referencedName, qualifier, ctx, myContext);
if (membersOfQualifier == null) {
return ret; // qualifier is positive that such name cannot exist in it
}