fixed PY-14430 Inspection fails for Numpy Arrays return by some functions

Used appropriate type for arrays, trim array element type names (f.i array of ndtype float -> array)
This commit is contained in:
Ekaterina Tuzova
2015-02-24 18:51:53 +03:00
parent deb048df2a
commit 5ee4984c8d
2 changed files with 6 additions and 2 deletions
@@ -49,7 +49,7 @@ public class NumpyDocStringTypeProvider extends PyTypeProviderBase {
// 16 occurrences
NUMPY_ALIAS_TO_REAL_TYPE.put("scalar", "int or long or float or complex");
// 10 occurrences
NUMPY_ALIAS_TO_REAL_TYPE.put("array", "collections.Iterable");
NUMPY_ALIAS_TO_REAL_TYPE.put("array", "numpy.core.multiarray.ndarray");
// 9 occurrences
NUMPY_ALIAS_TO_REAL_TYPE.put("any", "object");
// 5 occurrences
@@ -17,12 +17,12 @@ package com.jetbrains.numpy.documentation;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiElement;
import com.intellij.psi.util.QualifiedName;
import com.jetbrains.python.PyNames;
import com.jetbrains.python.psi.PyClass;
import com.jetbrains.python.psi.PyFile;
import com.jetbrains.python.psi.PyFunction;
import com.jetbrains.python.psi.PyPsiFacade;
import com.intellij.psi.util.QualifiedName;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -283,6 +283,10 @@ public class NumPyDocString {
if (index >= 0) {
return typeString.substring(0, index);
}
index = typeString.indexOf(" of "); // e.g. ndarray of dtype float
if (index >= 0) {
return typeString.substring(0, index);
}
return typeString;
}