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

Merge branch 'python-fixes'

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2014-03-04 20:42:29 +04:00
parent 7ba0d5326a fe93f3fa22
commit a3141a4d58
47 changed files with 311 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/psi-api/src/com/jetbrains/python/psi/Callable.java
+18 -2
View File
@@ -20,6 +20,8 @@ import com.jetbrains.python.psi.types.TypeEvalContext;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Map;
/**
* Something that can be called, passed parameters to, and return something back.
@@ -34,10 +36,24 @@ public interface Callable extends PyTypedElement, PyQualifiedNameOwner {
PyParameterList getParameterList();
/**
* @return the type of returned value.
* Returns the return type of the callable independent of a call site.
*/
@Nullable
PyType getReturnType(@NotNull TypeEvalContext context, @Nullable PyQualifiedExpression callSite);
PyType getReturnType(@NotNull TypeEvalContext context, @NotNull TypeEvalContext.Key key);
/**
* Returns the type of the call to the callable.
*/
@Nullable
PyType getCallType(@NotNull TypeEvalContext context, @NotNull PyQualifiedExpression callSite);
/**
* Returns the type of the call to the callable where the call site is specified by the optional receiver and the arguments to parameters
* mapping.
*/
@Nullable
PyType getCallType(@Nullable PyExpression receiver, @NotNull Map<PyExpression, PyNamedParameter> parameters,
@NotNull TypeEvalContext context);
/**
* @return a methods returns itself, non-method callables return null.
python/psi-api/src/com/jetbrains/python/psi/impl/PyTypeProvider.java
+4 -1
View File
@@ -39,7 +39,10 @@ public interface PyTypeProvider {
PyType getParameterType(@NotNull PyNamedParameter param, @NotNull PyFunction func, @NotNull TypeEvalContext context);
@Nullable
PyType getReturnType(@NotNull PyFunction function, @Nullable PyQualifiedExpression callSite, @NotNull TypeEvalContext context);
PyType getReturnType(@NotNull Callable callable, @NotNull TypeEvalContext context);
@Nullable
PyType getCallType(@NotNull PyFunction function, @Nullable PyQualifiedExpression callSite, @NotNull TypeEvalContext context);
@Nullable
PyType getContextManagerVariableType(PyClass contextManager, PyExpression withExpression, TypeEvalContext context);
python/psi-api/src/com/jetbrains/python/psi/types/PyCallableType.java
+9 -4
View File
@@ -34,14 +34,19 @@ public interface PyCallableType extends PyType {
boolean isCallable();
/**
* Returns the type which is the result of calling an instance of this type.
* Returns the return type of a function independent of a call site.
*
* @return the call result type or null if invalid.
* For example, it may return a generic type.
* @param context
* @param callSite
*/
@Nullable
PyType getCallType(@NotNull TypeEvalContext context, @Nullable PyQualifiedExpression callSite);
PyType getReturnType(@NotNull TypeEvalContext context);
/**
* Returns the type which is the result of calling an instance of this type.
*/
@Nullable
PyType getCallType(@NotNull TypeEvalContext context, @NotNull PyQualifiedExpression callSite);
/**
* Returns the list of parameter types.
python/psi-api/src/com/jetbrains/python/psi/types/PyType.java
+1 -2
View File
@@ -73,9 +73,8 @@ public interface PyType {
/**
* @return true if the type is a known built-in type.
* @param context
*/
boolean isBuiltin(TypeEvalContext context);
boolean isBuiltin();
void assertValid(String message);
}
python/psi-api/src/com/jetbrains/python/psi/types/PyTypeProviderBase.java
+7 -1
View File
@@ -94,8 +94,14 @@ public class PyTypeProviderBase implements PyTypeProvider {
return null;
}
@Nullable
@Override
public PyType getReturnType(@NotNull PyFunction function, @Nullable PyQualifiedExpression callSite, @NotNull TypeEvalContext context) {
public PyType getReturnType(@NotNull Callable callable, @NotNull TypeEvalContext context) {
return null;
}
@Override
public PyType getCallType(@NotNull PyFunction function, @Nullable PyQualifiedExpression callSite, @NotNull TypeEvalContext context) {
ReturnTypeDescriptor descriptor;
synchronized (myMethodToReturnTypeMap) {
descriptor = myMethodToReturnTypeMap.get(function.getName());
python/psi-api/src/com/jetbrains/python/psi/types/TypeEvalContext.java
+58 -21
View File
@@ -18,6 +18,7 @@ package com.jetbrains.python.psi.types;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.jetbrains.python.psi.Callable;
import com.jetbrains.python.psi.PyTypedElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -41,12 +42,19 @@ public class TypeEvalContext {
@Nullable private final PsiFile myOrigin;
private final Map<PyTypedElement, PyType> myEvaluated = new HashMap<PyTypedElement, PyType>();
private final Map<Callable, PyType> myEvaluatedReturn = new HashMap<Callable, PyType>();
private final ThreadLocal<Set<PyTypedElement>> myEvaluating = new ThreadLocal<Set<PyTypedElement>>() {
@Override
protected Set<PyTypedElement> initialValue() {
return new HashSet<PyTypedElement>();
}
};
private final ThreadLocal<Set<Callable>> myEvaluatingReturn = new ThreadLocal<Set<Callable>>() {
@Override
protected Set<Callable> initialValue() {
return new HashSet<Callable>();
}
};
private TypeEvalContext(boolean allowDataFlow, boolean allowStubToAST, @Nullable PsiFile origin) {
myAllowDataFlow = allowDataFlow;
@@ -114,64 +122,93 @@ public class TypeEvalContext {
}
return this;
}
public void trace(String message, Object... args) {
if (myTrace != null) {
myTrace.add(myTraceIndent + String.format(message, args));
}
}
public void traceIndent() {
if (myTrace != null) {
myTraceIndent += " ";
}
}
public void traceUnindent() {
if (myTrace != null && myTraceIndent.length() >= 2) {
myTraceIndent = myTraceIndent.substring(0, myTraceIndent.length()-2);
}
}
public String printTrace() {
return StringUtil.join(myTrace, "\n");
}
public boolean tracing() {
return myTrace != null;
}
@Nullable
public PyType getType(@NotNull PyTypedElement element) {
synchronized (myEvaluated) {
if (myEvaluated.containsKey(element)) {
final PyType pyType = myEvaluated.get(element);
if (pyType != null) {
pyType.assertValid(element.toString());
}
return pyType;
}
}
public PyType getType(@NotNull final PyTypedElement element) {
final Set<PyTypedElement> evaluating = myEvaluating.get();
if (evaluating.contains(element)) {
return null;
}
evaluating.add(element);
try {
PyType result = element.getType(this, Key.INSTANCE);
if (result != null) {
result.assertValid(element.toString());
}
synchronized (myEvaluated) {
myEvaluated.put(element, result);
if (myEvaluated.containsKey(element)) {
final PyType type = myEvaluated.get(element);
assertValid(type, element);
return type;
}
}
return result;
final PyType type = element.getType(this, Key.INSTANCE);
assertValid(type, element);
synchronized (myEvaluated) {
myEvaluated.put(element, type);
}
return type;
}
finally {
evaluating.remove(element);
}
}
@Nullable
public PyType getReturnType(@NotNull final Callable callable) {
final Set<Callable> evaluating = myEvaluatingReturn.get();
if (evaluating.contains(callable)) {
return null;
}
evaluating.add(callable);
try {
synchronized (myEvaluatedReturn) {
if (myEvaluatedReturn.containsKey(callable)) {
final PyType type = myEvaluatedReturn.get(callable);
assertValid(type, callable);
return type;
}
}
final PyType type = callable.getReturnType(this, Key.INSTANCE);
assertValid(type, callable);
synchronized (myEvaluatedReturn) {
myEvaluatedReturn.put(callable, type);
}
return type;
}
finally {
evaluating.remove(callable);
}
}
private static void assertValid(@Nullable PyType result, @NotNull PyTypedElement element) {
if (result != null) {
result.assertValid(element.toString());
}
}
public boolean maySwitchToAST(@NotNull PsiElement element) {
return myAllowStubToAST || myOrigin == element.getContainingFile();
}