MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-30 02:09:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Implicitly imported package members are already processed in PyModuleType instead of PyFile (PY-10819)

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2013-09-25 19:45:58 +04:00
parent 8fed6c91ee
commit 34c523582f
9 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
python/src/com/jetbrains/python/psi/impl/PyFileImpl.java
View File

@@ -97,28 +97,11 @@ public class PyFileImpl extends PsiFileBase implements PyFile, PyExpression {
addImportElementDeclaration(importElement, localDeclarations, ambiguousDeclarations);
}
}
if (PyNames.INIT_DOT_PY.equals(getName())) {
final PyQualifiedName qName = fromImportStatement.getImportSourceQName();
if (qName != null && !localDeclarations.containsKey(qName.toString())) {
localDeclarations.put(qName.getLastComponent(), fromImportStatement);
}
}
}
else if (child instanceof PyImportStatement) {
final PyImportStatement importStatement = (PyImportStatement)child;
for (PyImportElement importElement : importStatement.getImportElements()) {
addImportElementDeclaration(importElement, localDeclarations, ambiguousDeclarations);
if (PyNames.INIT_DOT_PY.equals(getName())) {
final PyQualifiedName qName = importElement.getImportedQName();
final PsiDirectory containingDirectory = getContainingDirectory();
if (qName != null && qName.getComponentCount() > 1 && containingDirectory != null) {
String parentPackage = containingDirectory.getName();
final List<String> components = qName.getComponents();
if (components.get(components.size() - 2).equals(parentPackage)) {
localDeclarations.put(components.get(components.size()-1), importElement);
}
}
}
}
}
else if (child instanceof NameDefiner) {

4
python/testData/resolve/multiFile/fromPackageModuleImportElementNamedAsModule/FromPackageModuleImportElementNamedAsModule.py Normal file
View File

@@ -0,0 +1,4 @@
from p1 import foo
foo()
#<ref>

1
python/testData/resolve/multiFile/fromPackageModuleImportElementNamedAsModule/p1/__init__.py Normal file
View File

@@ -0,0 +1 @@
from p1.foo import foo

2
python/testData/resolve/multiFile/fromPackageModuleImportElementNamedAsModule/p1/foo.py Normal file
View File

@@ -0,0 +1,2 @@
def foo():
pass

4
python/testData/resolve/multiFile/fromPackageModuleImportStarElementNamedAsModule/FromPackageModuleImportStarElementNamedAsModule.py Normal file
View File

@@ -0,0 +1,4 @@
from p1 import foo
foo()
#<ref>

1
python/testData/resolve/multiFile/fromPackageModuleImportStarElementNamedAsModule/p1/__init__.py Normal file
View File

@@ -0,0 +1 @@
from p1.foo import *

2
python/testData/resolve/multiFile/fromPackageModuleImportStarElementNamedAsModule/p1/foo.py Normal file
View File

@@ -0,0 +1,2 @@
def foo():
pass

8
python/testSrc/com/jetbrains/python/PyMultiFileResolveTest.java
View File

@@ -437,6 +437,14 @@ public class PyMultiFileResolveTest extends PyResolveTestCase {
assertResolvesTo(PyTargetExpression.class, "foo");
}
// PY-10819
public void testFromPackageModuleImportElementNamedAsModule() {
assertResolvesTo(PyFunction.class, "foo");
final PsiManager psiManager = myFixture.getPsiManager();
assertNotParsed((PyFile)psiManager.findFile(myFixture.findFileInTempDir("p1/__init__.py")));
assertNotParsed((PyFile)psiManager.findFile(myFixture.findFileInTempDir("p1/foo.py")));
}
private void prepareTestDirectory() {
final String testName = getTestName(true);
myFixture.copyDirectoryToProject(testName, "");

16
python/testSrc/com/jetbrains/python/PyStubsTest.java
View File

@@ -286,22 +286,6 @@ public class PyStubsTest extends PyTestCase {
assertNotParsed(file);
}
public void testInitPyExportsSubpackageImport() {
myFixture.copyDirectoryToProject("../resolve/multiFile/importPackageIntoSelf", "");
final PyFileImpl initPy = (PyFileImpl) myFixture.getPsiManager().findFile(myFixture.findFileInTempDir("mygame/__init__.py"));
final PsiElement element = initPy.findExportedName("display");
assertTrue(element instanceof PyImportElement);
assertNotParsed(initPy);
}
public void testInitPyExportsSubpackageFromImport() {
myFixture.copyDirectoryToProject("../resolve/multiFile/fromImportPackageIntoSelf", "");
final PyFileImpl initPy = (PyFileImpl) myFixture.getPsiManager().findFile(myFixture.findFileInTempDir("mygame/__init__.py"));
final PsiElement element = initPy.findExportedName("display");
assertInstanceOf(element, PyFile.class);
assertNotParsed(initPy);
}
public void testVariableIndex() {
getTestFile();
GlobalSearchScope scope = GlobalSearchScope.allScope(myFixture.getProject());