mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
scopes: wrong file parent: check if cached directory is parent for current file
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user