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-14527 Check that parent directories of the package not only have valid names but are packages as well

Browse Source
This commit is contained in:
Mikhail Golubev
2014-12-24 20:18:52 +03:00
parent 58cb75ba1e
commit 9d4d642f75
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/PyDirectoryIconProvider.java
+4 -6
View File
@@ -38,10 +38,8 @@ public class PyDirectoryIconProvider extends IconProvider {
if (element instanceof PsiDirectory) {
final PsiDirectory directory = (PsiDirectory)element;
// Preserve original icons for excluded directories and source roots
if (!isSpecialDirectory(directory)) {
if (PyUtil.isPackage(directory, false, null) && isImportable(directory)) {
return PlatformIcons.PACKAGE_ICON;
}
if (!isSpecialDirectory(directory) && isImportablePackage(directory)) {
return PlatformIcons.PACKAGE_ICON;
}
}
return null;
@@ -56,13 +54,13 @@ public class PyDirectoryIconProvider extends IconProvider {
return module == null || PyUtil.getSourceRoots(module).contains(vFile);
}
private static boolean isImportable(@NotNull PsiDirectory directory) {
private static boolean isImportablePackage(@NotNull PsiDirectory directory) {
final Collection<VirtualFile> sourceRoots = PyUtil.getSourceRoots(directory);
for (PsiDirectory dir = directory; dir != null; dir = dir.getParentDirectory()) {
if (sourceRoots.contains(dir.getVirtualFile())) {
return true;
}
if (!PyNames.isIdentifier(dir.getName())) {
if (!PyNames.isIdentifier(dir.getName()) || !PyUtil.isPackage(dir, false, null)) {
return false;
}
}