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

PyTypeProvider can return 'Any' type for parameter and return types

Browse Source 
Previously there was no way for a type provider to tell that the type
is really 'Any'. The 'null' return value was just a sign that the
provider doesn't know the return type and we should try other
alternatives.
This commit is contained in:
Andrey Vlasovskikh
2015-03-31 18:07:34 +03:00
parent f7fc82a999
commit bf1d5b924e
10 changed files with 68 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaTypeProvider.java
+8 -2
View File
@@ -16,6 +16,7 @@
package com.jetbrains.python.psi.impl;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.openapi.util.Ref;
import com.intellij.psi.*;
import com.intellij.util.Processor;
import com.jetbrains.python.psi.PyFunction;
@@ -65,7 +66,9 @@ public class PyJavaTypeProvider extends PyTypeProviderBase {
return null;
}
public PyType getParameterType(@NotNull final PyNamedParameter param, @NotNull final PyFunction func, @NotNull TypeEvalContext context) {
public Ref<PyType> getParameterType(@NotNull final PyNamedParameter param,
@NotNull final PyFunction func,
@NotNull TypeEvalContext context) {
if (!(param.getParent() instanceof PyParameterList)) return null;
List<PyNamedParameter> params = ParamHelper.collectNamedParameters((PyParameterList) param.getParent());
final int index = params.indexOf(param);
@@ -91,7 +94,10 @@ public class PyJavaTypeProvider extends PyTypeProviderBase {
}
});
if (superMethodParameterTypes.size() > 0) {
return superMethodParameterTypes.get(0);
final PyType type = superMethodParameterTypes.get(0);
if (type != null) {
return Ref.create(type);
}
}
return null;
}
python/psi-api/src/com/jetbrains/python/psi/impl/PyTypeProvider.java
+3 -2
View File
@@ -16,6 +16,7 @@
package com.jetbrains.python.psi.impl;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.util.Ref;
import com.intellij.psi.PsiElement;
import com.jetbrains.python.psi.*;
import com.jetbrains.python.psi.types.PyType;
@@ -36,10 +37,10 @@ public interface PyTypeProvider {
PyType getReferenceType(@NotNull PsiElement referenceTarget, TypeEvalContext context, @Nullable PsiElement anchor);
@Nullable
PyType getParameterType(@NotNull PyNamedParameter param, @NotNull PyFunction func, @NotNull TypeEvalContext context);
Ref<PyType> getParameterType(@NotNull PyNamedParameter param, @NotNull PyFunction func, @NotNull TypeEvalContext context);
@Nullable
PyType getReturnType(@NotNull PyCallable callable, @NotNull TypeEvalContext context);
Ref<PyType> getReturnType(@NotNull PyCallable callable, @NotNull TypeEvalContext context);
@Nullable
PyType getCallType(@NotNull PyFunction function, @Nullable PyCallSiteExpression callSite, @NotNull TypeEvalContext context);
python/psi-api/src/com/jetbrains/python/psi/types/PyTypeProviderBase.java
+3 -2
View File
@@ -15,6 +15,7 @@
*/
package com.jetbrains.python.psi.types;
import com.intellij.openapi.util.Ref;
import com.intellij.psi.PsiElement;
import com.intellij.util.containers.FactoryMap;
import com.jetbrains.python.psi.*;
@@ -92,13 +93,13 @@ public class PyTypeProviderBase implements PyTypeProvider {
}
@Override
public PyType getParameterType(@NotNull PyNamedParameter param, @NotNull PyFunction func, @NotNull TypeEvalContext context) {
public Ref<PyType> getParameterType(@NotNull PyNamedParameter param, @NotNull PyFunction func, @NotNull TypeEvalContext context) {
return null;
}
@Nullable
@Override
public PyType getReturnType(@NotNull PyCallable callable, @NotNull TypeEvalContext context) {
public Ref<PyType> getReturnType(@NotNull PyCallable callable, @NotNull TypeEvalContext context) {
return null;
}
python/src/com/jetbrains/numpy/codeInsight/NumpyDocStringTypeProvider.java
+11 -4
View File
@@ -16,6 +16,7 @@
package com.jetbrains.numpy.codeInsight;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
@@ -106,11 +107,14 @@ public class NumpyDocStringTypeProvider extends PyTypeProviderBase {
@Nullable
@Override
public PyType getParameterType(@NotNull PyNamedParameter parameter, @NotNull PyFunction function, @NotNull TypeEvalContext context) {
public Ref<PyType> getParameterType(@NotNull PyNamedParameter parameter, @NotNull PyFunction function, @NotNull TypeEvalContext context) {
if (isInsideNumPy(function)) {
final String name = parameter.getName();
if (name != null) {
return getParameterType(function, name);
final PyType type = getParameterType(function, name);
if (type != null) {
return Ref.create(type);
}
}
}
return null;
@@ -204,9 +208,12 @@ public class NumpyDocStringTypeProvider extends PyTypeProviderBase {
@Nullable
@Override
public PyType getReturnType(@NotNull PyCallable callable, @NotNull TypeEvalContext context) {
public Ref<PyType> getReturnType(@NotNull PyCallable callable, @NotNull TypeEvalContext context) {
if (callable instanceof PyFunction) {
return getCallType((PyFunction)callable, null, context);
final PyType type = getCallType((PyFunction)callable, null, context);
if (type != null) {
return Ref.create(type);
}
}
return null;
}
python/src/com/jetbrains/pyqt/PyQtTypeProvider.java
+6 -3
View File
@@ -15,6 +15,7 @@
*/
package com.jetbrains.pyqt;
import com.intellij.openapi.util.Ref;
import com.intellij.psi.util.QualifiedName;
import com.jetbrains.python.PyNames;
import com.jetbrains.python.psi.PyCallable;
@@ -36,7 +37,7 @@ public class PyQtTypeProvider extends PyTypeProviderBase {
private static final String ourQt4Signal = "pyqtSignal";
@Override
public PyType getReturnType(@NotNull PyCallable callable, @NotNull TypeEvalContext context) {
public Ref<PyType> getReturnType(@NotNull PyCallable callable, @NotNull TypeEvalContext context) {
if (PyNames.INIT.equals(callable.getName()) && callable instanceof PyFunction) {
final PyFunction function = (PyFunction)callable;
final PyClass containingClass = function.getContainingClass();
@@ -46,8 +47,10 @@ public class PyQtTypeProvider extends PyTypeProviderBase {
final QualifiedName name = QualifiedName.fromDottedString(classQName);
final String qtVersion = name.getComponents().get(0);
final PyClass aClass = PyClassNameIndex.findClass(qtVersion + "." + ourQtBoundSignal, function.getProject());
if (aClass != null)
return new PyClassTypeImpl(aClass, false);
if (aClass != null) {
final PyType type = new PyClassTypeImpl(aClass, false);
return Ref.create(type);
}
}
}
}
python/src/com/jetbrains/python/codeInsight/PyTypingTypeProvider.java
+9 -5
View File
@@ -51,13 +51,16 @@ public class PyTypingTypeProvider extends PyTypeProviderBase {
.add("typing.Protocol")
.build();
public PyType getParameterType(@NotNull PyNamedParameter param, @NotNull PyFunction func, @NotNull TypeEvalContext context) {
public Ref<PyType> getParameterType(@NotNull PyNamedParameter param, @NotNull PyFunction func, @NotNull TypeEvalContext context) {
final PyAnnotation annotation = param.getAnnotation();
if (annotation != null) {
// XXX: Requires switching from stub to AST
final PyExpression value = annotation.getValue();
if (value != null) {
return getTypingType(value, context);
final PyType type = getTypingType(value, context);
if (type != null) {
return Ref.create(type);
}
}
}
return null;
@@ -65,7 +68,7 @@ public class PyTypingTypeProvider extends PyTypeProviderBase {
@Nullable
@Override
public PyType getReturnType(@NotNull PyCallable callable, @NotNull TypeEvalContext context) {
public Ref<PyType> getReturnType(@NotNull PyCallable callable, @NotNull TypeEvalContext context) {
if (callable instanceof PyFunction) {
final PyFunction function = (PyFunction)callable;
final PyAnnotation annotation = function.getAnnotation();
@@ -73,12 +76,13 @@ public class PyTypingTypeProvider extends PyTypeProviderBase {
// XXX: Requires switching from stub to AST
final PyExpression value = annotation.getValue();
if (value != null) {
return getTypingType(value, context);
final PyType type = getTypingType(value, context);
return type != null ? Ref.create(type) : null;
}
}
final PyType constructorType = getGenericConstructorType(function, context);
if (constructorType != null) {
return constructorType;
return Ref.create(constructorType);
}
}
return null;
python/src/com/jetbrains/python/codeInsight/userSkeletons/PyUserSkeletonsTypeProvider.java
+11 -4
View File
@@ -15,6 +15,7 @@
*/
package com.jetbrains.python.codeInsight.userSkeletons;
import com.intellij.openapi.util.Ref;
import com.intellij.psi.PsiElement;
import com.jetbrains.python.psi.PyCallable;
import com.jetbrains.python.psi.PyFunction;
@@ -31,14 +32,17 @@ import org.jetbrains.annotations.Nullable;
*/
public class PyUserSkeletonsTypeProvider extends PyTypeProviderBase {
@Override
public PyType getParameterType(@NotNull PyNamedParameter param, @NotNull PyFunction func, @NotNull TypeEvalContext context) {
public Ref<PyType> getParameterType(@NotNull PyNamedParameter param, @NotNull PyFunction func, @NotNull TypeEvalContext context) {
final String name = param.getName();
if (name != null) {
final PyFunction functionSkeleton = PyUserSkeletonsUtil.getUserSkeleton(func);
if (functionSkeleton != null) {
final PyNamedParameter paramSkeleton = functionSkeleton.getParameterList().findParameterByName(name);
if (paramSkeleton != null) {
return context.getType(paramSkeleton);
final PyType type = context.getType(paramSkeleton);
if (type != null) {
return Ref.create(type);
}
}
}
}
@@ -47,10 +51,13 @@ public class PyUserSkeletonsTypeProvider extends PyTypeProviderBase {
@Nullable
@Override
public PyType getReturnType(@NotNull PyCallable callable, @NotNull TypeEvalContext context) {
public Ref<PyType> getReturnType(@NotNull PyCallable callable, @NotNull TypeEvalContext context) {
final PyCallable callableSkeleton = PyUserSkeletonsUtil.getUserSkeleton(callable);
if (callableSkeleton != null) {
return context.getReturnType(callableSkeleton);
final PyType type = context.getReturnType(callableSkeleton);
if (type != null) {
return Ref.create(type);
}
}
return null;
}
python/src/com/jetbrains/python/debugger/PyCallSignatureTypeProvider.java
+6 -2
View File
@@ -15,6 +15,7 @@
*/
package com.jetbrains.python.debugger;
import com.intellij.openapi.util.Ref;
import com.jetbrains.python.psi.PyFunction;
import com.jetbrains.python.psi.PyNamedParameter;
import com.jetbrains.python.psi.types.*;
@@ -24,14 +25,17 @@ import org.jetbrains.annotations.NotNull;
* @author traff
*/
public class PyCallSignatureTypeProvider extends PyTypeProviderBase {
public PyType getParameterType(@NotNull final PyNamedParameter param, @NotNull final PyFunction func, @NotNull TypeEvalContext context) {
public Ref<PyType> getParameterType(@NotNull final PyNamedParameter param,
@NotNull final PyFunction func,
@NotNull TypeEvalContext context) {
final String name = param.getName();
if (name != null) {
final String typeName = PySignatureCacheManager.getInstance(param.getProject()).findParameterType(func, name);
if (typeName != null) {
final PyType type = PyTypeParser.getTypeByName(param, typeName);
if (type != null) {
return PyDynamicallyEvaluatedType.create(type);
final PyType evaluatedType = PyDynamicallyEvaluatedType.create(type);
return Ref.create(evaluatedType);
}
}
}
python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
+6 -3
View File
@@ -184,9 +184,12 @@ public class PyFunctionImpl extends PyBaseElementImpl<PyFunctionStub> implements
@Override
public PyType getReturnType(@NotNull TypeEvalContext context, @NotNull TypeEvalContext.Key key) {
for (PyTypeProvider typeProvider : Extensions.getExtensions(PyTypeProvider.EP_NAME)) {
final PyType returnType = typeProvider.getReturnType(this, context);
if (returnType != null) {
returnType.assertValid(typeProvider.toString());
final Ref<PyType> returnTypeRef = typeProvider.getReturnType(this, context);
if (returnTypeRef != null) {
final PyType returnType = returnTypeRef.get();
if (returnType != null) {
returnType.assertValid(typeProvider.toString());
}
return returnType;
}
}
python/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java
+5 -2
View File
@@ -18,6 +18,7 @@ package com.jetbrains.python.psi.impl;
import com.intellij.lang.ASTNode;
import com.intellij.navigation.ItemPresentation;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.util.Ref;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiReference;
@@ -223,8 +224,10 @@ public class PyNamedParameterImpl extends PyBaseElementImpl<PyNamedParameterStub
return PyBuiltinCache.getInstance(this).getTupleType();
}
for(PyTypeProvider provider: Extensions.getExtensions(PyTypeProvider.EP_NAME)) {
PyType result = provider.getParameterType(this, func, context);
if (result != null) return result;
final Ref<PyType> resultRef = provider.getParameterType(this, func, context);
if (resultRef != null) {
return resultRef.get();
}
}
final PyAnnotation annotation = getAnnotation();
if (annotation != null) {