fix: search result for selector is template labels (#642)

Author: adietish

src/main/kotlin/com/redhat/devtools/intellij/kubernetes/usage/LabelsFilter.kt

@@ -38,7 +38,7 @@ import com.redhat.devtools.intellij.kubernetes.editor.util.isStatefulSet
 /**
  * A filter that accepts labels, that are matching a given selector.
  */
-class LabelsFilter(selector: PsiElement): PsiElementFilter {
+class LabelsFilter(selector: PsiElement): PsiElementFilter, MatchingElementMapping {
 
     private val selectorResource: PsiElement? by lazy {
         selector.getResource()
@@ -129,6 +129,11 @@ class LabelsFilter(selector: PsiElement): PsiElementFilter {
         }
     }
 
+    override fun getMatchingElement(element: PsiElement): PsiElement? {
+        val labeledType = element.getKubernetesTypeInfo() ?: return null
+        return getLabels(labeledType, element, selectorResourceType)
+    }
+
     private fun getLabels(
         labeledType: KubernetesTypeInfo,
         labeledResource: PsiElement,

src/main/kotlin/com/redhat/devtools/intellij/kubernetes/usage/MatchingElementMapping.kt

@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2025 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v20.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package com.redhat.devtools.intellij.kubernetes.usage
+
+import com.intellij.psi.PsiElement
+
+interface MatchingElementMapping {
+    fun getMatchingElement(element: PsiElement): PsiElement?
+}

src/main/kotlin/com/redhat/devtools/intellij/kubernetes/usage/SelectorUsageSearcher.kt

@@ -20,9 +20,7 @@ import com.intellij.usages.Usage
 import com.intellij.usages.UsageInfo2UsageAdapter
 import com.intellij.util.Processor
 import com.redhat.devtools.intellij.kubernetes.editor.util.PsiElements
-import com.redhat.devtools.intellij.kubernetes.editor.util.getLabels
 import com.redhat.devtools.intellij.kubernetes.editor.util.getResource
-import com.redhat.devtools.intellij.kubernetes.editor.util.getSelector
 import com.redhat.devtools.intellij.kubernetes.editor.util.isLabels
 import com.redhat.devtools.intellij.kubernetes.editor.util.isSelector
 
@@ -53,9 +51,11 @@ class SelectorUsageSearcher : CustomUsageSearcher() {
              **/
             //val searchScope = options.searchScope
             //if (searchScope.contains(file.virtualFile)) {
-            getAllMatching(searchParameter)
+            val filter = getFilter(searchParameter) ?:  return@run
+            val mapping = filter as? MatchingElementMapping ?: return@run
+            getAllMatching(searchParameter, filter)
                 .forEach { matchingElement ->
-                    val searchResult = getMatchingAttribute(searchParameter, matchingElement)
+                    val searchResult = mapping.getMatchingElement(matchingElement)?.parent
                     if (searchResult != null) {
                         processor.process(
                             UsageInfo2UsageAdapter(UsageInfo(searchResult))
@@ -65,10 +65,9 @@ class SelectorUsageSearcher : CustomUsageSearcher() {
         }
     }
 
-    private fun getAllMatching(searchParameter: PsiElement): Collection<PsiElement> {
+    private fun getAllMatching(searchParameter: PsiElement, filter:  PsiElementFilter): Collection<PsiElement> {
         val fileType = searchParameter.containingFile.fileType
         val project = searchParameter.project
-        val filter = getFilter(searchParameter) ?: return emptyList()
         return PsiElements.getAllNoExclusions(fileType, project)
             .filter(filter::isAccepted)
     }
@@ -87,14 +86,4 @@ class SelectorUsageSearcher : CustomUsageSearcher() {
         }
     }
 
-    private fun getMatchingAttribute(searchParameter: PsiElement, matchingElement: PsiElement): PsiElement? {
-        return when {
-            searchParameter.isSelector() ->
-                matchingElement.getLabels()?.parent // beginning of labels block/property
-            searchParameter.isLabels() ->
-                matchingElement.getSelector()?.parent // beginning of selector block/property
-            else ->
-                null
-        }
-    }
 }

src/main/kotlin/com/redhat/devtools/intellij/kubernetes/usage/SelectorsFilter.kt

@@ -14,14 +14,15 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.util.PsiElementFilter
 import com.redhat.devtools.intellij.common.validation.KubernetesTypeInfo
 import com.redhat.devtools.intellij.kubernetes.editor.util.getKubernetesTypeInfo
+import com.redhat.devtools.intellij.kubernetes.editor.util.getSelector
 import com.redhat.devtools.intellij.kubernetes.editor.util.hasLabels
 import com.redhat.devtools.intellij.kubernetes.editor.util.hasSelector
 import com.redhat.devtools.intellij.kubernetes.editor.util.hasTemplateLabels
 
 /**
  * A filter that accepts selectors that are matching a given label
  */
-class SelectorsFilter(private val labeledResource: PsiElement): PsiElementFilter {
+class SelectorsFilter(private val labeledResource: PsiElement): PsiElementFilter, MatchingElementMapping {
 
     private val labeledResourceType: KubernetesTypeInfo? by lazy {
         labeledResource.getKubernetesTypeInfo()
@@ -32,6 +33,10 @@ class SelectorsFilter(private val labeledResource: PsiElement): PsiElementFilter
                 || labeledResource.hasTemplateLabels()
     }
 
+    override fun getMatchingElement(element: PsiElement): PsiElement? {
+        return element.getSelector()
+    }
+
     override fun isAccepted(toAccept: PsiElement): Boolean {
         if (labeledResourceType == null
             || !hasLabels