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
2013-08-01 15:38:58 +04:00
parent 4d17f7aa5c c0a7dd24c1
commit 8837eea814
42 changed files with 336 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/psi-api/src/com/jetbrains/python/PyNames.java
+1
View File
@@ -136,6 +136,7 @@ public class PyNames {
public static final String NOT_IMPLEMENTED_ERROR = "NotImplementedError";
public static final String UNKNOWN_TYPE = "unknown";
/**
* Contains all known predefined names of "__foo__" form.
python/psi-api/src/com/jetbrains/python/psi/types/PyCallableType.java
+3 -2
View File
@@ -1,5 +1,6 @@
package com.jetbrains.python.psi.types;
import com.intellij.openapi.util.Pair;
import com.jetbrains.python.psi.PyQualifiedExpression;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -31,8 +32,8 @@ public interface PyCallableType extends PyType {
/**
* Returns the list of parameter types.
*
* @return list of positional parameters or null if not applicable.
* @return list of (name, type) pairs or null if not applicable. Name and type in pair may be null.
*/
@Nullable
List<PyType> getParameterTypes(@NotNull TypeEvalContext context);
List<Pair<String, PyType>> getParameters(@NotNull TypeEvalContext context);
}