Commit 90cef844 authored by Semyon Proshev's avatar Semyon Proshev
Browse files

PY-18555 Fixed: IAE in PyNamedTupleType.getCallType

Revert nullability annotation of second argument in PyClassTypeImpl.getCallType
parent 0cad86ad
Showing with 9 additions and 3 deletions
+9 -3
...@@ -368,12 +368,17 @@ public class PyClassTypeImpl extends UserDataHolderBase implements PyClassType { ...@@ -368,12 +368,17 @@ public class PyClassTypeImpl extends UserDataHolderBase implements PyClassType {
@Nullable @Nullable
@Override @Override
public PyType getReturnType(@NotNull TypeEvalContext context) { public PyType getReturnType(@NotNull TypeEvalContext context) {
return getCallType(context, null); return getReturnType(context, null);
} }
@Nullable @Nullable
@Override @Override
public PyType getCallType(@NotNull TypeEvalContext context, @Nullable PyCallSiteExpression callSite) { public PyType getCallType(@NotNull TypeEvalContext context, @NotNull PyCallSiteExpression callSite) {
return getReturnType(context, callSite);
}
@Nullable
private PyType getReturnType(@NotNull TypeEvalContext context, @Nullable PyCallSiteExpression callSite) {
if (!isDefinition()) { if (!isDefinition()) {
final PyResolveContext resolveContext = PyResolveContext.noImplicits().withTypeEvalContext(context); final PyResolveContext resolveContext = PyResolveContext.noImplicits().withTypeEvalContext(context);
final List<? extends RatedResolveResult> resolveResults = resolveMember(PyNames.CALL, callSite, AccessDirection.READ, resolveContext); final List<? extends RatedResolveResult> resolveResults = resolveMember(PyNames.CALL, callSite, AccessDirection.READ, resolveContext);
...@@ -389,7 +394,8 @@ public class PyClassTypeImpl extends UserDataHolderBase implements PyClassType { ...@@ -389,7 +394,8 @@ public class PyClassTypeImpl extends UserDataHolderBase implements PyClassType {
return PyUnionType.union(result); return PyUnionType.union(result);
} }
} else { }
else {
return new PyClassTypeImpl(getPyClass(), false); return new PyClassTypeImpl(getPyClass(), false);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment