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

first goto symbol speedup

Browse Source 
allow inheritors of GoToSymbolProvider to quickly filter out inapplicable modules instead of trying to find symbols for every single module, which can involve expensive module service creation and whole-project order entry enumeration
This commit is contained in:
peter
2018-11-14 20:43:15 +01:00
parent a187563641
commit 7fcc048781
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/dom-impl/src/com/intellij/util/xml/model/gotosymbol/GoToSymbolProvider.java
+10 -7
View File
@@ -41,6 +41,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.Collection;
import java.util.List;
import java.util.Set;
@@ -49,7 +50,7 @@ import java.util.Set;
*/
public abstract class GoToSymbolProvider implements ChooseByNameContributor {
// non-static to store modules accepted by different providers separately
private final Key<CachedValue<List<Module>>> ACCEPTABLE_MODULES = Key.create("ACCEPTABLE_MODULES_" + toString());
private final Key<CachedValue<Collection<Module>>> ACCEPTABLE_MODULES = Key.create("ACCEPTABLE_MODULES_" + toString());
protected abstract void addNames(@NotNull Module module, Set<String> result);
@@ -63,11 +64,14 @@ public abstract class GoToSymbolProvider implements ChooseByNameContributor {
}
}
private List<Module> getAcceptableModules(final Project project) {
return CachedValuesManager.getManager(project).getCachedValue(project, ACCEPTABLE_MODULES, () -> {
List<Module> result = ContainerUtil.findAll(ModuleManager.getInstance(project).getModules(), module -> acceptModule(module));
return CachedValueProvider.Result.create(result, PsiModificationTracker.MODIFICATION_COUNT);
}, false);
private Collection<Module> getAcceptableModules(final Project project) {
return CachedValuesManager.getManager(project).getCachedValue(project, ACCEPTABLE_MODULES, () ->
CachedValueProvider.Result.create(calcAcceptableModules(project), PsiModificationTracker.MODIFICATION_COUNT), false);
}
@NotNull
protected Collection<Module> calcAcceptableModules(@NotNull Project project) {
return ContainerUtil.findAll(ModuleManager.getInstance(project).getModules(), module -> acceptModule(module));
}
@Override
@@ -159,7 +163,6 @@ public abstract class GoToSymbolProvider implements ChooseByNameContributor {
}
@Override
@Nullable
public String getLocationString() {
return '(' + myPsiElement.getContainingFile().getName() + ')';
}