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

don't offer top-level packages in completion of relative imports (PY-6304)

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-04-25 21:59:01 +02:00
parent 0a7e0a6063
commit 2da4446a0c
5 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/impl/references/PyImportReference.java
+11 -11
View File
@@ -167,7 +167,7 @@ public class PyImportReference extends PyReferenceImpl {
}
public Object[] execute() {
int relative_level = -1;
int relativeLevel = -1;
InsertHandler<LookupElement> insertHandler = null;
// NOTE: could use getPointInImport()
@@ -191,9 +191,9 @@ public class PyImportReference extends PyReferenceImpl {
}
}
else { // null source, must be a "from ... import"
relative_level = from_import.getRelativeLevel();
if (relative_level > 0) {
PsiDirectory relative_dir = ResolveImportUtil.stepBackFrom(myCurrentFile, relative_level);
relativeLevel = from_import.getRelativeLevel();
if (relativeLevel > 0) {
PsiDirectory relative_dir = ResolveImportUtil.stepBackFrom(myCurrentFile, relativeLevel);
if (relative_dir != null) {
addImportedNames(from_import.getImportElements());
fillFromDir(relative_dir, null);
@@ -204,7 +204,7 @@ public class PyImportReference extends PyReferenceImpl {
else { // in "import _" or "from _ import"
ASTNode n = myElement.getNode().getTreePrev();
while (n != null && n.getElementType() == PyTokenTypes.DOT) {
relative_level += 1;
relativeLevel += 1;
n = n.getTreePrev();
}
if (from_import != null) {
@@ -221,21 +221,21 @@ public class PyImportReference extends PyReferenceImpl {
}
}
// look at dir by level
if (myCurrentFile != null && (relative_level >= 0 || !ResolveImportUtil.isAbsoluteImportEnabledFor(myCurrentFile))) {
if (myCurrentFile != null && (relativeLevel >= 0 || !ResolveImportUtil.isAbsoluteImportEnabledFor(myCurrentFile))) {
final PsiDirectory containingDirectory = myCurrentFile.getContainingDirectory();
if (containingDirectory != null) {
PyQualifiedName thisQName = ResolveImportUtil.findShortestImportableQName(containingDirectory);
if (thisQName == null) {
fillFromDir(ResolveImportUtil.stepBackFrom(myCurrentFile, relative_level), insertHandler);
if (thisQName == null || thisQName.getComponentCount() == relativeLevel) {
fillFromDir(ResolveImportUtil.stepBackFrom(myCurrentFile, relativeLevel), insertHandler);
}
else if (thisQName.getComponentCount() >= relative_level) {
thisQName = thisQName.removeTail(relative_level);
else if (thisQName.getComponentCount() > relativeLevel) {
thisQName = thisQName.removeTail(relativeLevel);
fillFromQName(thisQName, insertHandler);
}
}
}
}
if (relative_level == -1) {
if (relativeLevel == -1) {
fillFromQName(PyQualifiedName.fromComponents(), insertHandler);
}
python/testData/completion/relativeImportExcludeToplevel/pack/__init__.py
View File
python/testData/completion/relativeImportExcludeToplevel/pack/subpack/__init__.py
+1
View File
@@ -0,0 +1 @@
__author__ = 'yole'
python/testData/completion/relativeImportExcludeToplevel/pack/subpack/modX.py
+1
View File
@@ -0,0 +1 @@
from ...<caret> import
python/testSrc/com/jetbrains/python/PythonCompletionTest.java
+13
View File
@@ -550,4 +550,17 @@ public class PythonCompletionTest extends PyTestCase {
public void testQualifiedAssignment() { // PY-6121
doTest();
}
public void testRelativeImportExcludeToplevel() { // PY-6304
setLanguageLevel(LanguageLevel.PYTHON27);
try {
myFixture.copyDirectoryToProject("completion/relativeImportExcludeToplevel", "");
myFixture.configureByFile("pack/subpack/modX.py");
myFixture.completeBasic();
assertFalse(myFixture.getLookupElementStrings().contains("sys"));
}
finally {
setLanguageLevel(null);
}
}
}