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

fix off-by-one error in counting target directory for relative imports (part of PY-2816)

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-02-22 19:18:37 +01:00
parent 288072a3cd
commit 14626e2e8e
7 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/impl/PyImportReferenceImpl.java
+3 -3
View File
@@ -146,7 +146,7 @@ public class PyImportReferenceImpl extends PyReferenceImpl {
}
public Object[] execute() {
int relative_level = 0;
int relative_level = -1;
Condition<PsiElement> node_filter = new PyResolveUtil.FilterNameNotIn(myNamesAlready);
InsertHandler<LookupElement> insertHandler = null;
@@ -208,7 +208,7 @@ public class PyImportReferenceImpl extends PyReferenceImpl {
}
}
// look at dir by level
if (myCurrentFile != null && (relative_level > 0 || !ResolveImportUtil.isAbsoluteImportEnabledFor(myCurrentFile))) {
if (myCurrentFile != null && (relative_level >= 0 || !ResolveImportUtil.isAbsoluteImportEnabledFor(myCurrentFile))) {
PyQualifiedName thisQName = ResolveImportUtil.findShortestImportableQName(myCurrentFile.getContainingDirectory());
if (thisQName == null) {
fillFromDir(ResolveImportUtil.stepBackFrom(myCurrentFile, relative_level), insertHandler);
@@ -219,7 +219,7 @@ public class PyImportReferenceImpl extends PyReferenceImpl {
}
}
}
if (relative_level == 0) {
if (relative_level == -1) {
fillFromQName(PyQualifiedName.fromComponents(), insertHandler);
}
python/testData/completion/relativeImport/__init__.py
View File
python/testData/completion/relativeImport/pkg/__init__.py
View File
python/testData/completion/relativeImport/pkg/main.after.py
+1
View File
@@ -0,0 +1 @@
from .string import <caret>
python/testData/completion/relativeImport/pkg/main.py
+1
View File
@@ -0,0 +1 @@
from .s<caret>
python/testData/completion/relativeImport/pkg/string.py
View File
python/testSrc/com/jetbrains/python/PythonCompletionTest.java
+7
View File
@@ -275,4 +275,11 @@ public class PythonCompletionTest extends PyLightFixtureTestCase {
public void testSuperClassAttributesNoCompletionInFunc() {
doTest();
}
public void testRelativeImport() { // PY-2816
myFixture.copyDirectoryToProject("completion/relativeImport", "relativeImport");
myFixture.configureByFile("relativeImport/pkg/main.py");
myFixture.completeBasic();
myFixture.checkResultByFile("completion/relativeImport/pkg/main.after.py");
}
}