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

Enabling read write filter if at least one usage has read/write access detector

Browse Source 
REF #41920

GitOrigin-RevId: 3d632a23f7347e140ec239dac75e9e986438d9bc
This commit is contained in:
elena.korotkova
2020-06-16 13:27:01 +03:00
committed by intellij-monorepo-bot
parent f3e72bf79d
commit 16ea3bcebb
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
+17 -14
View File
@@ -189,6 +189,8 @@ public class UsageViewImpl implements UsageViewEx {
myGroupingRules = getActiveGroupingRules(project, getUsageViewSettings());
myFilteringRules = getActiveFilteringRules(project);
//by default disable read/write filter - enabling it if resulting usages have read/write access
setReadWriteFilterEnabled(false);
myBuilder = new UsageNodeTreeBuilder(myTargets, myGroupingRules, myFilteringRules, myRoot, myProject);
@@ -667,23 +669,22 @@ public class UsageViewImpl implements UsageViewEx {
return list.toArray(UsageFilteringRule.EMPTY_ARRAY);
}
protected void adjustReadWriteUsageFilter(Collection<? extends Usage> usages) {
boolean b = usages.stream().anyMatch(usage -> {
if(usage instanceof PsiElementUsage){
PsiElement element = ((PsiElementUsage) usage).getElement();
ReadWriteAccessDetector detector = ReadWriteAccessDetector.findDetector(element);
if(detector.isDeclarationWriteAccess(element) || detector.isDeclarationWriteAccess(element)){
return true;
}
protected boolean isUsageReadWriteAccessible(Usage usage) {
if(usage instanceof PsiElementUsage){
PsiElement element = ((PsiElementUsage) usage).getElement();
ReadWriteAccessDetector detector = ReadWriteAccessDetector.findDetector(element);
if(detector != null){
return true;
}
return false;
});
}
return false;
}
protected void setReadWriteFilterEnabled(boolean b) {
for (UsageFilteringRuleProvider provider : UsageFilteringRuleProvider.EP_NAME.getExtensionList()) {
if (provider instanceof UsageFilteringRuleProvider){
((UsageFilteringRuleProviderImpl)provider) .setReadWriteEnabled(b);
if (provider instanceof UsageFilteringRuleProviderImpl){
((UsageFilteringRuleProviderImpl)provider).setReadWriteEnabled(b);
}
}
}
@@ -1229,7 +1230,6 @@ public class UsageViewImpl implements UsageViewEx {
@NotNull
@Override
public CompletableFuture<?> appendUsagesInBulk(@NotNull Collection<? extends Usage> usages) {
adjustReadWriteUsageFilter(usages);
CompletableFuture<Object> result = new CompletableFuture<>();
addUpdateRequest(() -> ReadAction.run(() -> {
try {
@@ -1247,6 +1247,9 @@ public class UsageViewImpl implements UsageViewEx {
}
public UsageNode doAppendUsage(@NotNull Usage usage) {
if(isUsageReadWriteAccessible(usage)) {
setReadWriteFilterEnabled(true);
}
assert !ApplicationManager.getApplication().isDispatchThread();
// invoke in ReadAction to be be sure that usages are not invalidated while the tree is being built
ApplicationManager.getApplication().assertReadAccessAllowed();