From 5dd2eb64cf2b4e1aab39b156586b18449de2a807 Mon Sep 17 00:00:00 2001 From: Nikita Biriukov Date: Thu, 12 Dec 2024 13:09:09 +0100 Subject: [PATCH] [gradle][groovy] IDEA-343916 add Gradle icon in autocomplete variants for version catalogs with default location The icon was available only for version catalogs with custom location. Code review: IJ-CR-153925 (cherry picked from commit b00d2ccd1901705489097ad193dcd97cb0fb9062) GitOrigin-RevId: 65fbd12dbe95f05763bb8d64c65ab7c1cd67db3c --- .../java/src/service/resolve/GradleExtensionsContributor.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/gradle/java/src/service/resolve/GradleExtensionsContributor.kt b/plugins/gradle/java/src/service/resolve/GradleExtensionsContributor.kt index a6c4619997bb..ab85bb0ae741 100644 --- a/plugins/gradle/java/src/service/resolve/GradleExtensionsContributor.kt +++ b/plugins/gradle/java/src/service/resolve/GradleExtensionsContributor.kt @@ -7,6 +7,7 @@ import com.intellij.openapi.roots.ProjectFileIndex import com.intellij.psi.* import com.intellij.psi.scope.PsiScopeProcessor import com.intellij.psi.util.InheritanceUtil +import icons.GradleIcons import org.jetbrains.plugins.gradle.service.resolve.GradleCommonClassNames.GRADLE_API_PROJECT import org.jetbrains.plugins.gradle.settings.GradleExtensionsSettings import org.jetbrains.plugins.gradle.settings.GradleExtensionsSettings.GradleExtensionsData @@ -16,6 +17,7 @@ import org.jetbrains.plugins.groovy.lang.resolve.api.GroovyPropertyBase import org.jetbrains.plugins.groovy.lang.resolve.getName import org.jetbrains.plugins.groovy.lang.resolve.processors.inference.type import org.jetbrains.plugins.groovy.lang.resolve.shouldProcessProperties +import javax.swing.Icon class GradleExtensionsContributor : NonCodeMembersContributor() { @@ -97,6 +99,10 @@ class GradleExtensionsContributor : NonCodeMembersContributor() { override fun getPropertyType(): PsiType { return PsiElementFactory.getInstance(project).createType(clazz, PsiSubstitutor.EMPTY) } + + override fun getIcon(flags: Int): Icon? { + return GradleIcons.Gradle + } } fun processPropertiesFromCatalog(name: String?, place: PsiElement, processor: PsiScopeProcessor, state: ResolveState) : Set? {