Use parameters provided by function type for generating override method

This commit is contained in:
Andrey Vlasovskikh
2013-09-13 16:24:32 +04:00
parent 4ade2a679d
commit dce5c8e936
@@ -179,7 +179,8 @@ public class PyOverrideImplementUtil {
if (anno != null) {
pyFunctionBuilder.annotation(anno.getText());
}
final PyParameter[] baseParams = baseFunction.getParameterList().getParameters();
final TypeEvalContext context = TypeEvalContext.userInitiated(baseFunction.getContainingFile());
final List<PyParameter> baseParams = PyUtil.getParameters(baseFunction, context);
for (PyParameter parameter : baseParams) {
pyFunctionBuilder.parameter(parameter.getText());
}
@@ -211,7 +212,6 @@ public class PyOverrideImplementUtil {
statementBody.append(PyNames.PASS);
}
else {
final TypeEvalContext context = TypeEvalContext.userInitiated(baseFunction.getContainingFile());
if (!PyNames.INIT.equals(baseFunction.getName()) && baseFunction.getReturnType(context, null) != PyNoneType.INSTANCE) {
statementBody.append("return ");
}