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-331486 [Java]: check search scope for enum constant declarations when searching constructor references

Browse Source 
GitOrigin-RevId: f85d71a8fd56dea17266354c912cb13292083b5a
This commit is contained in:
Bas Leijdekkers
2025-11-11 15:28:02 +00:00
committed by intellij-monorepo-bot
parent 4045dfeecb
commit 7f0b84b0f2
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-indexing-impl/src/com/intellij/psi/impl/search/ConstructorReferencesSearchHelper.java
+4 -3
View File
@@ -56,7 +56,7 @@ class ConstructorReferencesSearchHelper {
});
if (isEnum[0]) {
if (!processEnumReferences(processor, constructor, project, containingClass)) return false;
if (!processEnumReferences(processor, constructor, project, containingClass, searchScope)) return false;
}
// search usages like "new XXX(..)"
@@ -114,10 +114,11 @@ class ConstructorReferencesSearchHelper {
private static boolean processEnumReferences(@NotNull Processor<? super PsiReference> processor,
@NotNull PsiMethod constructor,
@NotNull Project project,
@NotNull PsiClass aClass) {
@NotNull PsiClass aClass,
@NotNull SearchScope searchScope) {
return DumbService.getInstance(project).runReadActionInSmartMode(() -> {
for (PsiField field : aClass.getFields()) {
if (field instanceof PsiEnumConstant) {
if (field instanceof PsiEnumConstant && PsiSearchScopeUtil.isInScope(searchScope, field)) {
PsiReference reference = field.getReference();
if (reference != null && reference.isReferenceTo(constructor) && !processor.process(reference)) {
return false;
java/java-tests/testSrc/com/intellij/java/codeInsight/codeVision/JavaCodeVisionProviderTest.kt
+20 -1
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.java.codeInsight.codeVision
import com.intellij.codeInsight.daemon.impl.JavaInheritorsCodeVisionProvider
@@ -91,6 +91,25 @@ class JavaCodeVisionProviderTest : CodeVisionTestCase() {
}
""".trimIndent(), JavaReferencesCodeVisionProvider().groupId)
fun testEnumConstructor() = doTest("""
enum LocationType {/*<# [no usages] #>*/
FOREST("Forest"),/*<# [no usages] #>*/
PLAIN("Plain"),/*<# [no usages] #>*/
DESERT("Desert"),/*<# [no usages] #>*/
HILLS("hills");/*<# [no usages] #>*/
private final String typeName;/*<# [2 usages] #>*/
LocationType(String typeName) {/*<# [4 usages] #>*/
this.typeName = typeName;
}
public String getTypeName() {/*<# [no usages] #>*/
return typeName;
}
}
""".trimIndent(), JavaReferencesCodeVisionProvider().groupId)
fun testClassAtZeroOffset() = doTest("""
class A { /*<# [no usages] #>*/
enum E { /*<# [6 usages] #>*/