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

IDEA-206125 enum values highlighted as used in case its class is @EnumSource value cleanup

Browse Source 
GitOrigin-RevId: 0d18ea681fcdd3f9866f22a0bd6d01811ed2489e
This commit is contained in:
Olga.Klisho
2020-06-16 01:09:46 +03:00
committed by intellij-monorepo-bot
parent 4576614a5b
commit f62a5de1e0
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/UnusedSymbolUtil.java
-3
View File
@@ -105,9 +105,6 @@ public class UnusedSymbolUtil {
if (field instanceof PsiEnumConstant && isEnumValuesMethodUsed(project, containingFile, field, progress, helper)) {
return false;
}
if (isImplicitUsage(project, field)) {
return false;
}
return weAreSureThereAreNoUsages(project, containingFile, field, progress, helper);
}
plugins/junit/src/com/intellij/execution/junit2/inspection/JunitEnumSourceImplicitUsageProvider.java
+19 -16
View File
@@ -2,9 +2,12 @@
package com.intellij.execution.junit2.inspection;
import com.intellij.codeInsight.daemon.ImplicitUsageProvider;
import com.intellij.psi.*;
import com.intellij.psi.PsiAnnotation;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.impl.source.PsiEnumConstantImpl;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.LocalSearchScope;
import com.intellij.psi.search.PsiSearchHelper;
import com.intellij.psi.search.SearchScope;
import com.intellij.psi.search.searches.ReferencesSearch;
@@ -21,14 +24,16 @@ public class JunitEnumSourceImplicitUsageProvider implements ImplicitUsageProvid
PsiClass psiClass = ((PsiEnumConstantImpl)element).getContainingClass();
String className = psiClass != null ? psiClass.getName() : null;
if (className == null) return false;
GlobalSearchScope useScope = psiClass.getResolveScope();
PsiSearchHelper searchHelper = PsiSearchHelper.getInstance(psiClass.getProject());
PsiSearchHelper.SearchCostResult cheapEnough = searchHelper.isCheapEnoughToSearch(className, useScope, null,
null);
SearchScope useScope = psiClass.getUseScope();
if (cheapEnough == PsiSearchHelper.SearchCostResult.ZERO_OCCURRENCES ||
cheapEnough == PsiSearchHelper.SearchCostResult.TOO_MANY_OCCURRENCES) {
return false;
if (!(useScope instanceof LocalSearchScope)) {
PsiSearchHelper searchHelper = PsiSearchHelper.getInstance(psiClass.getProject());
PsiSearchHelper.SearchCostResult cheapEnough = searchHelper.isCheapEnoughToSearch(className, (GlobalSearchScope)useScope, null,
null);
if (cheapEnough == PsiSearchHelper.SearchCostResult.ZERO_OCCURRENCES ||
cheapEnough == PsiSearchHelper.SearchCostResult.TOO_MANY_OCCURRENCES) {
return false;
}
}
return ReferencesSearch.search(psiClass, useScope, false)
.anyMatch(reference -> {
@@ -40,14 +45,12 @@ public class JunitEnumSourceImplicitUsageProvider implements ImplicitUsageProvid
}
private static boolean isReferencedInsideEnumSourceAnnotation(PsiElement referenceElement) {
PsiElement parent = referenceElement;
while ((parent = PsiTreeUtil.getParentOfType(parent, PsiAnnotationParameterList.class, true)) != null) {
PsiAnnotation annotation = (PsiAnnotation)parent.getParent();
String annotationName = annotation.getQualifiedName();
if (ENUM_SOURCE.equals(annotationName) && annotation.getAttributes().size() == 1) {
return true;
}
PsiAnnotation annotation = PsiTreeUtil.getParentOfType(referenceElement, PsiAnnotation.class);
if (annotation != null) {
String annotationName = annotation.getQualifiedName();
if (ENUM_SOURCE.equals(annotationName) && annotation.getAttributes().size() == 1) {
return true;
}
}
return false;
}