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

PY-15366 No completion for matplotlib figure

Browse Source 
matplotlib uses numpy docstrings. Added numpy to the user code ( due to PY-4717 Support for NumpyDoc)
This commit is contained in:
Ekaterina Tuzova
2015-05-05 17:03:35 +03:00
parent 44db0949ce
commit 4495d85bb4
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/numpy/codeInsight/NumpyDocStringTypeProvider.java
+20 -5
View File
@@ -17,6 +17,8 @@ package com.jetbrains.numpy.codeInsight;
import com.google.common.collect.Lists;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
@@ -24,6 +26,7 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.jetbrains.numpy.documentation.NumPyDocString;
import com.jetbrains.numpy.documentation.NumPyDocStringParameter;
import com.jetbrains.python.documentation.PyDocumentationSettings;
import com.jetbrains.python.psi.*;
import com.jetbrains.python.psi.impl.PyBuiltinCache;
import com.jetbrains.python.psi.impl.PyExpressionCodeFragmentImpl;
@@ -83,7 +86,7 @@ public class NumpyDocStringTypeProvider extends PyTypeProviderBase {
@Nullable
@Override
public PyType getCallType(@NotNull PyFunction function, @Nullable PyCallSiteExpression callSite, @NotNull TypeEvalContext context) {
if (isInsideNumPy(function)) {
if (isApplicable(function)) {
final PyExpression callee = callSite instanceof PyCallExpression ? ((PyCallExpression)callSite).getCallee() : null;
final NumPyDocString docString = NumPyDocString.forFunction(function, callee);
if (docString != null) {
@@ -140,7 +143,7 @@ public class NumpyDocStringTypeProvider extends PyTypeProviderBase {
@Nullable
@Override
public Ref<PyType> getParameterType(@NotNull PyNamedParameter parameter, @NotNull PyFunction function, @NotNull TypeEvalContext context) {
if (isInsideNumPy(function)) {
if (isApplicable(function)) {
final String name = parameter.getName();
if (name != null) {
final PyType type = getParameterType(function, name);
@@ -153,19 +156,31 @@ public class NumpyDocStringTypeProvider extends PyTypeProviderBase {
}
private static boolean isInsideNumPy(@NotNull PsiElement element) {
if (ApplicationManager.getApplication().isUnitTestMode()) return true;
final PsiFile file = element.getContainingFile();
if (file != null) {
final PyPsiFacade facade = getPsiFacade(element);
final VirtualFile virtualFile = file.getVirtualFile();
if (virtualFile != null) {
final String name = facade.findShortestImportableName(virtualFile, element);
return name != null && name.startsWith("numpy.");
return name != null && (name.startsWith("numpy.") || name.startsWith("matplotlib."));
}
}
return false;
}
private static boolean isApplicable(@NotNull PsiElement element) {
if (ApplicationManager.getApplication().isUnitTestMode()) return true;
final Module module = ModuleUtilCore.findModuleForPsiElement(element);
if (module != null){
if (PyDocumentationSettings.getInstance(module).isNumpyFormat(element.getContainingFile())) {
return true;
}
}
return isInsideNumPy(element);
}
private static PyPsiFacade getPsiFacade(@NotNull PsiElement anchor) {
return PyPsiFacade.getInstance(anchor.getProject());
}
@@ -237,7 +252,7 @@ public class NumpyDocStringTypeProvider extends PyTypeProviderBase {
private static boolean isUfuncType(@NotNull PsiElement anchor, @NotNull final String typeString) {
for (String typeName : NumPyDocString.getNumpyUnionType(typeString)) {
if (anchor instanceof PyFunction && NumpyUfuncs.isUFunc(((PyFunction)anchor).getName()) &&
if (anchor instanceof PyFunction && isInsideNumPy(anchor) && NumpyUfuncs.isUFunc(((PyFunction)anchor).getName()) &&
("array_like".equals(typeName) || "ndarray".equals(typeName))) {
return true;
}
python/src/com/jetbrains/python/documentation/DocStringFormat.java
+2 -1
View File
@@ -26,8 +26,9 @@ public class DocStringFormat {
public static final String PLAIN = "Plain";
public static final String EPYTEXT = "Epytext";
public static final String REST = "reStructuredText";
public static final String NUMPY = "NumPy";
public static final List<String> ALL = ImmutableList.of(PLAIN, EPYTEXT, REST);
public static final List<String> ALL = ImmutableList.of(PLAIN, EPYTEXT, REST, NUMPY);
private DocStringFormat() {
}
python/src/com/jetbrains/python/documentation/PyDocumentationSettings.java
+4
View File
@@ -53,6 +53,10 @@ public class PyDocumentationSettings implements PersistentStateComponent<PyDocum
return isFormat(file, DocStringFormat.REST);
}
public boolean isNumpyFormat(PsiFile file) {
return isFormat(file, DocStringFormat.NUMPY);
}
public boolean isPlain(PsiFile file) {
return isFormat(file, DocStringFormat.PLAIN);
}