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

fun expr search: don't hold methods in memory for more time than needed

Browse Source
This commit is contained in:
peter
2016-08-05 17:19:56 +02:00
parent 0ff7036ecf
commit 382b5c50d7
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java
+13 -18
View File
@@ -168,16 +168,20 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
}
@NotNull
private static MultiMap<VirtualFile, Integer> getCandidateOffsets(SamDescriptor descriptor, MultiMap<Location, GlobalSearchScope> queries) {
MultiMap<VirtualFile, Integer> result = MultiMap.create();
private static MultiMap<VirtualFile, Integer> getCandidateOffsets(SamDescriptor descriptor, MultiMap<Location, GlobalSearchScope> queries, Set<VirtualFile> likelyFiles) {
MultiMap<VirtualFile, Integer> result = MultiMap.createLinked();
MultiMap<VirtualFile, Integer> unlikely = MultiMap.createLinked();
for (Location location : queries.keySet()) {
MultiMap<VirtualFile, Integer> offsets = getOffsetsForLocation(descriptor, location, queries.get(location));
result.putAllValues(offsets);
for (VirtualFile file : offsets.keySet()) {
(likelyFiles.contains(file) ? result : unlikely).putValues(file, offsets.get(file));
}
if (LOG.isDebugEnabled()) {
logIfLarge(offsets, location);
}
}
result.putAllValues(unlikely);
if (LOG.isDebugEnabled()) {
LOG.debug("checking " + result.values().size() + " fun-expressions in " + result.keySet().size() + " files");
}
@@ -397,10 +401,11 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
this.isVoid = PsiType.VOID.equals(samType);
}
private boolean search(@NotNull Processor<PsiFunctionalExpression> consumer, Set<Module> highLevelModules) {
@NotNull
private MultiMap<VirtualFile, Integer> getOffsets(Set<Module> highLevelModules) {
GlobalSearchScope visibleFromCandidates = ReadAction.compute(
() -> samClass.isValid() ? combineResolveScopes(highLevelModules, samClass) : null);
if (visibleFromCandidates == null) return true;
if (visibleFromCandidates == null) return MultiMap.empty();
Set<String> usedMethodNames = collectMethodNamesCalledWithFunExpressions(this);
Set<PsiMethod> exactTypeMethods = getMethodsWithParameterType(usedMethodNames, useScope.intersectWith(visibleFromCandidates), getClassName());
@@ -408,21 +413,11 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
LOG.debug("#methods: " + (exactTypeMethods.size() + genericMethods.size()));
MultiMap<Location, GlobalSearchScope> queries = collectQueryKeys(this, ContainerUtil.concat(exactTypeMethods, genericMethods));
return processLikelyFirst(getMostLikelyFiles(exactTypeMethods), consumer, queries);
return getCandidateOffsets(this, queries, getMostLikelyFiles(exactTypeMethods));
}
private boolean processLikelyFirst(Set<VirtualFile> likelyFiles,
@NotNull Processor<PsiFunctionalExpression> consumer,
MultiMap<Location, GlobalSearchScope> queries) {
MultiMap<VirtualFile, Integer> file2Offsets = getCandidateOffsets(this, queries);
for (VirtualFile file : likelyFiles) {
Collection<Integer> offsets = file2Offsets.remove(file);
if (offsets != null && !processFile(consumer, samClass, file, offsets)) {
return false;
}
}
for (Map.Entry<VirtualFile, Collection<Integer>> entry : file2Offsets.entrySet()) {
private boolean search(@NotNull Processor<PsiFunctionalExpression> consumer, Set<Module> highLevelModules) {
for (Map.Entry<VirtualFile, Collection<Integer>> entry : getOffsets(highLevelModules).entrySet()) {
if (!processFile(consumer, samClass, entry.getKey(), entry.getValue())) {
return false;
}