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

complete imported names inside __all__ (PY-6306)

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-04-25 19:09:02 +02:00
parent 73e5c6749a
commit 2b64b8d52e
4 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/PyDunderAllReference.java
+12 -2
View File
@@ -1,5 +1,8 @@
package com.jetbrains.python.codeInsight;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupElementBuilder;
import com.intellij.openapi.util.Iconable;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
@@ -9,6 +12,7 @@ import com.intellij.psi.ResolveState;
import com.intellij.psi.scope.PsiScopeProcessor;
import com.intellij.util.ArrayUtil;
import com.jetbrains.python.psi.PyFile;
import com.jetbrains.python.psi.PyImportElement;
import com.jetbrains.python.psi.PyStringLiteralExpression;
import com.jetbrains.python.psi.PyUtil;
import com.jetbrains.python.psi.impl.LightNamedElement;
@@ -41,7 +45,7 @@ public class PyDunderAllReference extends PsiReferenceBase<PyStringLiteralExpres
@NotNull
@Override
public Object[] getVariants() {
final List<PsiElement> result = new ArrayList<PsiElement>();
final List<LookupElement> result = new ArrayList<LookupElement>();
PyFile containingFile = (PyFile) getElement().getContainingFile().getOriginalFile();
final List<String> dunderAll = containingFile.getDunderAll();
containingFile.processDeclarations(new PsiScopeProcessor() {
@@ -50,7 +54,13 @@ public class PyDunderAllReference extends PsiReferenceBase<PyStringLiteralExpres
if (element instanceof PsiNamedElement && !(element instanceof LightNamedElement)) {
final String name = ((PsiNamedElement)element).getName();
if (name != null && PyUtil.getInitialUnderscores(name) == 0 && (dunderAll == null || !dunderAll.contains(name))) {
result.add(element);
result.add(LookupElementBuilder.create((PsiNamedElement) element).setIcon(element.getIcon(Iconable.ICON_FLAG_CLOSED)));
}
}
else if (element instanceof PyImportElement) {
final String visibleName = ((PyImportElement)element).getVisibleName();
if (visibleName != null && (dunderAll == null || !dunderAll.contains(visibleName))) {
result.add(LookupElementBuilder.create(element, visibleName));
}
}
return true;
python/testData/completion/dunderAllReferenceImport.after.py
+3
View File
@@ -0,0 +1,3 @@
from sys import hexversion
__all__ = ['hexversion']
python/testData/completion/dunderAllReferenceImport.py
+3
View File
@@ -0,0 +1,3 @@
from sys import hexversion
__all__ = ['hexve<caret>']
python/testSrc/com/jetbrains/python/PythonCompletionTest.java
+4
View File
@@ -529,6 +529,10 @@ public class PythonCompletionTest extends PyTestCase {
doTest();
}
public void testDunderAllReferenceImport() { // PY-6306
doTest();
}
public void testOldStyleClassAttributes() {
doTest();
}