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

Cleanup

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2013-01-11 16:48:35 +04:00
parent 7809540191
commit 30f70e6f11
3 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/psi-api/src/com/jetbrains/python/psi/impl/PyTypeProvider.java
+1 -1
View File
@@ -27,7 +27,7 @@ public interface PyTypeProvider {
PyType getReturnType(@NotNull PyFunction function, @Nullable PyQualifiedExpression callSite, @NotNull TypeEvalContext context);
@Nullable
PyType getIterationType(PyClass iterable);
PyType getIterationType(@NotNull PyClass iterable);
@Nullable
PyType getContextManagerVariableType(PyClass contextManager, PyExpression withExpression, TypeEvalContext context);
python/psi-api/src/com/jetbrains/python/psi/types/PyTypeProviderBase.java
+1 -1
View File
@@ -92,7 +92,7 @@ public class PyTypeProviderBase implements PyTypeProvider {
}
@Override
public PyType getIterationType(PyClass iterable) {
public PyType getIterationType(@NotNull PyClass iterable) {
return null;
}
python/src/com/jetbrains/python/codeInsight/stdlib/PyStdlibTypeProvider.java
+33 -19
View File
@@ -26,8 +26,8 @@ import java.util.Properties;
* @author yole
*/
public class PyStdlibTypeProvider extends PyTypeProviderBase {
private Properties myStdlibTypes2 = new Properties();
private Properties myStdlibTypes3 = new Properties();
@NotNull private Properties myStdlibTypes2 = new Properties();
@NotNull private Properties myStdlibTypes3 = new Properties();
@Nullable
public static PyStdlibTypeProvider getInstance() {
@@ -115,8 +115,9 @@ public class PyStdlibTypeProvider extends PyTypeProviderBase {
return null;
}
@Nullable
@Override
public PyType getIterationType(PyClass iterable) {
public PyType getIterationType(@NotNull PyClass iterable) {
final PyBuiltinCache builtinCache = PyBuiltinCache.getInstance(iterable);
if (builtinCache.hasInBuiltins(iterable)) {
if ("file".equals(iterable.getName())) {
@@ -128,7 +129,7 @@ public class PyStdlibTypeProvider extends PyTypeProviderBase {
@Nullable
@Override
public PyType getContextManagerVariableType(PyClass contextManager, PyExpression withExpression, TypeEvalContext context) {
public PyType getContextManagerVariableType(@NotNull PyClass contextManager, @NotNull PyExpression withExpression, @NotNull TypeEvalContext context) {
if ("contextlib.closing".equals(contextManager.getQualifiedName()) && withExpression instanceof PyCallExpression) {
PyExpression closee = ((PyCallExpression)withExpression).getArgument(0, PyExpression.class);
if (closee != null) {
@@ -159,18 +160,8 @@ public class PyStdlibTypeProvider extends PyTypeProviderBase {
}
PyType argType = entry.getKey().getType(context);
// Special case for the 'mode' argument of the 'open()' builtin
if (("__builtin__.open".equals(qname) || "io.open".equals(qname) || "os.fdopen".equals(qname)) && "mode".equals(name)) {
final PyBuiltinCache cache = PyBuiltinCache.getInstance(anchor);
final LanguageLevel level = LanguageLevel.forElement(anchor);
argType = cache.getUnicodeType(level);
final PyExpression modeExpr = entry.getKey();
if (modeExpr instanceof PyStringLiteralExpression) {
final String literal = ((PyStringLiteralExpression)modeExpr).getStringValue();
if (literal.contains("b")) {
argType = cache.getBytesType(level);
}
}
}
final PyExpression modeExpr = entry.getKey();
argType = getOpenFunctionType(argType, qname, name, modeExpr, anchor);
final PyType paramType = getParameterTypeByQName(overloadedQName, name, anchor);
if (PyTypeChecker.match(paramType, argType, context)) {
if (argType != null && paramType != null) {
@@ -190,7 +181,29 @@ public class PyStdlibTypeProvider extends PyTypeProviderBase {
return null;
}
@Nullable PyType getParameterTypeByQName(@NotNull String functionQName, @NotNull String name, @NotNull PsiElement anchor) {
@Nullable
private PyType getOpenFunctionType(@Nullable PyType argType,
@NotNull String callQName,
@NotNull String parameterName,
@NotNull PyExpression modeExpr,
@NotNull PsiElement anchor) {
if (("__builtin__.open".equals(callQName) || "io.open".equals(callQName) || "os.fdopen".equals(callQName)) &&
"mode".equals(parameterName)) {
final PyBuiltinCache cache = PyBuiltinCache.getInstance(anchor);
final LanguageLevel level = LanguageLevel.forElement(anchor);
argType = cache.getUnicodeType(level);
if (modeExpr instanceof PyStringLiteralExpression) {
final String literal = ((PyStringLiteralExpression)modeExpr).getStringValue();
if (literal.contains("b")) {
argType = cache.getBytesType(level);
}
}
}
return argType;
}
@Nullable
private PyType getParameterTypeByQName(@NotNull String functionQName, @NotNull String name, @NotNull PsiElement anchor) {
final LanguageLevel level = LanguageLevel.forElement(anchor);
final String key = String.format("Python%d/%s.%s", level.getVersion(), functionQName, name);
final PyBuiltinCache cache = PyBuiltinCache.getInstance(anchor);
@@ -212,7 +225,7 @@ public class PyStdlibTypeProvider extends PyTypeProviderBase {
}
@Nullable
private StructuredDocString getStructuredDocString(String qualifiedName, LanguageLevel level) {
private StructuredDocString getStructuredDocString(@NotNull String qualifiedName, @NotNull LanguageLevel level) {
final Properties db = getStdlibTypes(level);
final String docString = db.getProperty(qualifiedName);
if (docString == null && level.isPy3K()) { //if we couldn't find for Py3K will search in Python2 db
@@ -246,7 +259,8 @@ public class PyStdlibTypeProvider extends PyTypeProviderBase {
return result;
}
private Properties getStdlibTypes(LanguageLevel level) {
@NotNull
private Properties getStdlibTypes(@NotNull LanguageLevel level) {
final Properties result = level.isPy3K() ? myStdlibTypes3 : myStdlibTypes2;
final String name = level.isPy3K() ? "StdlibTypes3" : "StdlibTypes2";
if (result.isEmpty()) {