From f62a5de1e079f5a7637e9cbcabdf9f500aa1ce9a Mon Sep 17 00:00:00 2001
From: "Olga.Klisho" <Olga.Klisho@jetbrains.com>
Date: Tue, 16 Jun 2020 00:07:24 +0300
Subject: [PATCH] IDEA-206125 enum values highlighted as used in case its class
 is @EnumSource value cleanup

GitOrigin-RevId: 0d18ea681fcdd3f9866f22a0bd6d01811ed2489e
---
 .../daemon/impl/UnusedSymbolUtil.java         |  3 --
 .../JunitEnumSourceImplicitUsageProvider.java | 35 ++++++++++---------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/UnusedSymbolUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/UnusedSymbolUtil.java
index 9c554cf7445c..2ae5ab327fd1 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/UnusedSymbolUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/UnusedSymbolUtil.java
@@ -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);
   }
 
diff --git a/plugins/junit/src/com/intellij/execution/junit2/inspection/JunitEnumSourceImplicitUsageProvider.java b/plugins/junit/src/com/intellij/execution/junit2/inspection/JunitEnumSourceImplicitUsageProvider.java
index 10b12bc1fe85..7711e93a3e66 100644
--- a/plugins/junit/src/com/intellij/execution/junit2/inspection/JunitEnumSourceImplicitUsageProvider.java
+++ b/plugins/junit/src/com/intellij/execution/junit2/inspection/JunitEnumSourceImplicitUsageProvider.java
@@ -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;
   }