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

Fix VFS children loading

Browse Source
This commit is contained in:
Roman Shevchenko
2013-02-18 11:47:54 +01:00
parent b32b62b2c6
commit df0739b461
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java
+8 -6
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
* Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -154,6 +154,7 @@ public class PersistentFSImpl extends PersistentFS implements ApplicationCompone
@NotNull
private static FSRecords.NameId[] persistAllChildren(@NotNull final VirtualFile file, final int id, @NotNull FSRecords.NameId[] current) {
final NewVirtualFileSystem fs = replaceWithNativeFS(getDelegate(file));
String[] delegateNames = VfsUtil.filterNames(fs.list(file));
if (delegateNames.length == 0 && current.length > 0) {
return current;
@@ -176,10 +177,11 @@ public class PersistentFSImpl extends PersistentFS implements ApplicationCompone
}
}
final TIntArrayList childrenIds = new TIntArrayList();
result.transformValues(new TObjectFunction<FSRecords.NameId, FSRecords.NameId>() {
final TIntArrayList childrenIds = new TIntArrayList(result.size());
final List<FSRecords.NameId> nameIds = ContainerUtil.newArrayListWithExpectedSize(result.size());
result.forEachValue(new TObjectProcedure<FSRecords.NameId>() {
@Override
public FSRecords.NameId execute(FSRecords.NameId nameId) {
public boolean execute(FSRecords.NameId nameId) {
if (nameId.id < 0) {
FakeVirtualFile child = new FakeVirtualFile(file, nameId.name);
FileAttributes attributes = fs.getAttributes(child);
@@ -190,15 +192,15 @@ public class PersistentFSImpl extends PersistentFS implements ApplicationCompone
}
if (nameId.id > 0) {
childrenIds.add(nameId.id);
nameIds.add(nameId);
}
return nameId;
return true;
}
});
FSRecords.updateList(id, childrenIds.toNativeArray());
setChildrenCached(id);
Collection<FSRecords.NameId> nameIds = result.values();
return nameIds.toArray(new FSRecords.NameId[nameIds.size()]);
}