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

bug fix: PyDevDocumentation provider should use best available parent reference expression to lookup documentation.

Browse Source
This commit is contained in:
fitermay
2016-08-28 20:59:16 -04:00
parent 1207ea5d1b
commit e1aa4eac1f
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/console/PydevDocumentationProvider.java
+13 -11
View File
@@ -16,13 +16,15 @@
package com.jetbrains.python.console;
import com.intellij.lang.documentation.AbstractDocumentationProvider;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiManager;
import com.intellij.psi.util.PsiTreeUtil;
import com.jetbrains.python.console.completion.PydevConsoleElement;
import com.jetbrains.python.console.pydev.ConsoleCommunication;
import com.jetbrains.python.psi.PyExpression;
import com.jetbrains.python.console.completion.PydevConsoleReference;
import com.jetbrains.python.documentation.PyDocumentationBuilder;
import com.jetbrains.python.psi.PyElement;
import com.jetbrains.python.psi.PyReferenceExpression;
import com.jetbrains.python.psi.PyUtil;
import org.jetbrains.annotations.Nullable;
/**
@@ -49,21 +51,21 @@ public class PydevDocumentationProvider extends AbstractDocumentationProvider {
@Nullable
public static String createDoc(final PsiElement element, final PsiElement originalElement) {
final PyExpression expression = PsiTreeUtil.getParentOfType(originalElement, PyExpression.class);
final PyReferenceExpression expression = PsiTreeUtil.getNonStrictParentOfType(originalElement, PyReferenceExpression.class);
// Indicates that we are inside console, not a lookup element!
if (expression == null){
return null;
}
final ConsoleCommunication communication = PydevConsoleRunner.getConsoleCommunication(originalElement);
if (communication == null){
PydevConsoleReference consoleRef = PyUtil.as(expression.getReference(), PydevConsoleReference.class);
if (consoleRef == null) { //shouldn't really happen!
return null;
}
try {
final String description = communication.getDescription(expression.getText());
return StringUtil.isEmptyOrSpaces(description) ? null : description;
}
catch (Exception e) {
PyElement documentationElement = consoleRef.getDocumentationElement();
if (documentationElement == null) {
return null;
}
return new PyDocumentationBuilder(documentationElement, null).build();
}
}