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

PY-255 parse __init__.py for * imports

Browse Source
This commit is contained in:
Dennis Ushakov
2010-01-27 15:53:02 +03:00
parent d2107bd3b4
commit ddcbe140aa
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/impl/PyFromImportStatementImpl.java
+6 -1
View File
@@ -17,7 +17,9 @@
package com.jetbrains.python.psi.impl;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.ResolveState;
import com.intellij.psi.scope.PsiScopeProcessor;
import com.intellij.psi.tree.TokenSet;
@@ -104,7 +106,10 @@ public class PyFromImportStatementImpl extends PyElementImpl implements PyFromIm
PyReferenceExpression expr = getImportSource();
if (expr != null) {
final PsiElement importedFile = ResolveImportUtil.resolveImportReference(expr);
if (importedFile != null) {
if (importedFile instanceof PsiDirectory) {
PsiFile file = ((PsiDirectory)importedFile).findFile(PyNames.INIT_DOT_PY);
if (file != null) return file.processDeclarations(processor, state, null, place);
} else if (importedFile != null) {
return importedFile.processDeclarations(processor, state, null, place);
}
}