MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Changed Callable.getCallType() with explicit 'null' call site to Callable.getReturnType()

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2014-03-03 15:00:48 +04:00
parent dd898e2d02
commit eb0b14f04f
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/override/PyOverrideImplementUtil.java
+1 -1
View File
@@ -225,7 +225,7 @@ public class PyOverrideImplementUtil {
statementBody.append(PyNames.PASS);
}
else {
if (!PyNames.INIT.equals(baseFunction.getName()) && baseFunction.getCallType(context, null) != PyNoneType.INSTANCE) {
if (!PyNames.INIT.equals(baseFunction.getName()) && baseFunction.getReturnType(context) != PyNoneType.INSTANCE) {
statementBody.append("return ");
}
if (baseClass.isNewStyleClass()) {
python/src/com/jetbrains/python/psi/impl/PyCallExpressionHelper.java
+1 -1
View File
@@ -198,7 +198,7 @@ public class PyCallExpressionHelper {
final PyFunction function = (PyFunction)resolved;
final Property property = function.getProperty();
if (property != null && isQualifiedByInstance(function, qualifiers, context)) {
final PyType type = function.getCallType(context, null);
final PyType type = function.getReturnType(context);
if (type instanceof PyFunctionType) {
resolved = ((PyFunctionType)type).getCallable();
}
python/src/com/jetbrains/python/psi/impl/PyClassImpl.java
+1 -1
View File
@@ -750,7 +750,7 @@ public class PyClassImpl extends PyPresentableElementImpl<PyClassStub> implement
if (!(callable instanceof StubBasedPsiElement) && !context.maySwitchToAST(callable)) {
return null;
}
return callable.getCallType(context, null);
return callable.getReturnType(context);
}
return null;
}
python/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java
+1 -1
View File
@@ -208,7 +208,7 @@ public class PyNamedParameterImpl extends PyPresentableElementImpl<PyNamedParame
PyType initType = null;
final PyFunction init = containingClass.findInitOrNew(true);
if (init != null && init != func) {
initType = init.getCallType(context, null);
initType = init.getReturnType(context);
if (init.getContainingClass() != containingClass) {
if (initType instanceof PyCollectionType) {
final PyType elementType = ((PyCollectionType)initType).getElementType(context);