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

RootIndex: less vfs lookups when searching for non-existing packages, don't cache empty results

Browse Source
This commit is contained in:
peter
2013-10-30 09:15:23 +01:00
parent 54b7936e2a
commit 07a29bd9cb
2 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java
+1 -1
View File
@@ -466,7 +466,7 @@ public class DirectoryIndexImpl extends DirectoryIndex {
RootIndex rootIndex = getRootIndex();
if (rootIndex != null) {
Collection<VirtualFile> riResult = rootIndex.getDirectoriesByPackageName(packageName, includeLibrarySources).findAll();
Collection<VirtualFile> riResult = rootIndex.getDirectoriesByPackageName(packageName, includeLibrarySources);
Collection<VirtualFile> standard = standardResult.findAll();
if (!new HashSet<VirtualFile>(riResult).equals(new HashSet<VirtualFile>(standard))) {
for (VirtualFile file : standard) {
platform/lang-impl/src/com/intellij/openapi/roots/impl/RootIndex.java
+21 -33
View File
@@ -29,8 +29,6 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.newvfs.events.VFileEvent;
import com.intellij.util.CollectionQuery;
import com.intellij.util.Query;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.MultiMap;
import gnu.trove.TObjectIntHashMap;
@@ -347,54 +345,44 @@ class RootIndex {
}
@NotNull
public Query<VirtualFile> getDirectoriesByPackageName(@NotNull final String packageName, final boolean includeLibrarySources) {
List<VirtualFile> getDirectoriesByPackageName(@NotNull final String packageName, final boolean includeLibrarySources) {
Map<String, List<VirtualFile>> cacheMap = includeLibrarySources ?
myDirectoriesByPackageNameCacheWithLibSrc :
myDirectoriesByPackageNameCache;
final List<VirtualFile> cachedResult = cacheMap.get(packageName);
if (cachedResult != null) {
return new CollectionQuery<VirtualFile>(cachedResult);
return cachedResult;
}
final ArrayList<VirtualFile> result = ContainerUtil.newArrayList();
for (Map.Entry<String, HashSet<VirtualFile>> entry : myPackagePrefixRoots.entrySet()) {
if (!packageName.startsWith(entry.getKey())) {
continue;
}
if (packageName.equals(entry.getKey())) {
for (VirtualFile file : entry.getValue()) {
if (isValidPackageDirectory(includeLibrarySources, file)) {
result.add(file);
}
}
continue;
}
final String nestedPackageName = entry.getKey().isEmpty() ? packageName : packageName.substring( entry.getKey().length());
final List<String> nestedPackages = StringUtil.split(nestedPackageName, ".");
for (final VirtualFile root : entry.getValue()) {
VirtualFile file = root;
for (String name : nestedPackages) {
file = file.findChild(name);
if (file == null) {
break;
}
}
Set<VirtualFile> packagePrefixRoots = myPackagePrefixRoots.get(packageName);
if (packagePrefixRoots != null) {
for (VirtualFile file : packagePrefixRoots) {
if (isValidPackageDirectory(includeLibrarySources, file)) {
result.add(file);
}
}
}
cacheMap.put(packageName, result);
return new CollectionQuery<VirtualFile>(result);
if (StringUtil.isNotEmpty(packageName)) {
String parentPackage = StringUtil.getPackageName(packageName);
String shortName = StringUtil.getShortName(packageName);
for (VirtualFile parentDir : getDirectoriesByPackageName(parentPackage, includeLibrarySources)) {
VirtualFile child = parentDir.findChild(shortName);
if (isValidPackageDirectory(includeLibrarySources, child)) {
result.add(child);
}
}
}
if (!result.isEmpty()) {
cacheMap.put(packageName, result);
}
return result;
}
private boolean isValidPackageDirectory(boolean includeLibrarySources, @Nullable VirtualFile file) {
if (file != null) {
if (file != null && file.isDirectory()) {
DirectoryInfo info = getInfoForDirectory(file);
if (info != null) {
if (includeLibrarySources || !info.isInLibrarySource() || info.isInModuleSource() || info.hasLibraryClassRoot()) {