scopes: wrong file parent: check if cached directory is parent for current file

This commit is contained in:
anna
2011-08-03 22:02:17 +04:00
parent 3c337530d3
commit feebad1f9d
2 changed files with 10 additions and 0 deletions
@@ -169,9 +169,14 @@ public class TreeModelBuilder {
countFiles(project);
myFileIndex.iterateContent(new ContentIterator() {
PackageDependenciesNode lastParent = null;
VirtualFile dir = null;
public boolean processFile(VirtualFile fileOrDir) {
if (!fileOrDir.isDirectory()) {
if (lastParent != null && dir != fileOrDir.getParent()) {
lastParent = null;
}
lastParent = buildFileNode(fileOrDir, lastParent);
dir = fileOrDir.getParent();
} else {
lastParent = null;
}
@@ -528,10 +528,15 @@ public class FileTreeModelBuilder {
private class MyContentIterator implements ContentIterator {
PackageDependenciesNode lastParent = null;
VirtualFile dir;
public boolean processFile(VirtualFile fileOrDir) {
if (!fileOrDir.isDirectory()) {
if (lastParent != null && dir != fileOrDir.getParent()) {
lastParent = null;
}
lastParent = buildFileNode(fileOrDir, lastParent);
dir = fileOrDir.getParent();
} else {
lastParent = null;
}