improved oid reference providers for oid tags

Evolveum · Mar 4, 2024 · 4817423 · 4817423
1 parent c9a97d8
commit 4817423
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 28 deletions.
diff --git a/.../evolveum/midpoint/studio/impl/lang/annotation/AxiomQueryValidationExternalAnnotator.java b/.../evolveum/midpoint/studio/impl/lang/annotation/AxiomQueryValidationExternalAnnotator.java
@@ -36,7 +36,7 @@ public List<AxiomQueryError> doAnnotate(final PsiFile file) {
             return Collections.emptyList();
         }
 
-        return axiomQueryLangService.validate(file.getText());
+        return axiomQueryLangService.validate(content);
     }
 
     @Override

diff --git a/...va/com/evolveum/midpoint/studio/impl/lang/codeInsight/OidInlayParameterHintsProvider.java b/...va/com/evolveum/midpoint/studio/impl/lang/codeInsight/OidInlayParameterHintsProvider.java
@@ -26,7 +26,7 @@ public class OidInlayParameterHintsProvider implements InlayParameterHintsProvid
     @NotNull
     @Override
     public List<InlayInfo> getParameterHints(PsiElement element) {
-        if (!isReferenceOidAttribute(element) && !PsiUtils.isReferenceOidTag(element)) {
+        if (!PsiUtils.isReferenceOidAttributeValue(element) && !PsiUtils.isReferenceOidTag(element)) {
             return Collections.emptyList();
         }
 
@@ -73,18 +73,6 @@ public List<InlayInfo> getParameterHints(PsiElement element) {
         return List.of(new InlayInfo(label, offset, false, true, false));
     }
 
-    private boolean isReferenceOidAttribute(PsiElement element) {
-        if (!(element instanceof XmlAttributeValue value)) {
-            return false;
-        }
-
-        if (!(value.getParent() instanceof XmlAttribute attribute)) {
-            return false;
-        }
-
-        return "oid".equals(attribute.getLocalName());
-    }
-
     private int inlayOffset(PsiElement expr, boolean atEnd) {
         if (expr.getTextRange().isEmpty()) {
             PsiElement next = expr.getNextSibling();

diff --git a/studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/psi/OidReference.java b/studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/psi/OidReference.java
@@ -4,17 +4,17 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.PsiReferenceBase;
-import com.intellij.psi.xml.XmlAttributeValue;
+import com.intellij.psi.xml.XmlElement;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Created by Viliam Repan (lazyman).
  */
-public class OidReference extends PsiReferenceBase<XmlAttributeValue> {
+public class OidReference extends PsiReferenceBase<XmlElement> {
 
     private final VirtualFile file;
 
-    public OidReference(XmlAttributeValue element, VirtualFile file) {
+    public OidReference(XmlElement element, VirtualFile file) {
         super(element, true);
 
         this.file = file;

diff --git a/...a-plugin/src/main/java/com/evolveum/midpoint/studio/impl/psi/OidReferenceContributor.java b/...a-plugin/src/main/java/com/evolveum/midpoint/studio/impl/psi/OidReferenceContributor.java
@@ -18,5 +18,10 @@ public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar)
                         .withParent(
                                 XmlPatterns.xmlAttribute("oid")),
                 new OidReferenceProvider());
+
+        registrar.registerReferenceProvider(
+                XmlPatterns
+                        .xmlTag().withLocalName("oid"),
+                new OidReferenceProvider());
     }
 }
diff --git a/...idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/psi/OidReferenceProvider.java b/...idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/psi/OidReferenceProvider.java
@@ -2,11 +2,14 @@
 
 import com.evolveum.midpoint.studio.impl.psi.search.ObjectFileBasedIndexImpl;
 import com.evolveum.midpoint.studio.util.MidPointUtils;
+import com.evolveum.midpoint.studio.util.PsiUtils;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.PsiReferenceProvider;
 import com.intellij.psi.xml.XmlAttributeValue;
+import com.intellij.psi.xml.XmlElement;
+import com.intellij.psi.xml.XmlTag;
 import com.intellij.util.ProcessingContext;
 import org.jetbrains.annotations.NotNull;
 
@@ -18,30 +21,35 @@
  */
 public class OidReferenceProvider extends PsiReferenceProvider {
 
-    // todo for object[oid] show only data from /objects folder maybe?
     @NotNull
     @Override
     public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
-        if (!(element instanceof XmlAttributeValue attrValue)) {
+        if (!PsiUtils.isReferenceOidAttributeValue(element) && !PsiUtils.isReferenceOidTag(element)) {
             return PsiReference.EMPTY_ARRAY;
         }
 
-        boolean isObjectOid = MidPointUtils.isItObjectTypeOidAttribute(element);
-
-        String oid = attrValue.getValue();
+        XmlTag ref = PsiUtils.findObjectReferenceTag(element);
+        if (ref == null) {
+            return PsiReference.EMPTY_ARRAY;
+        }
 
-        List<VirtualFile> files = ObjectFileBasedIndexImpl.getVirtualFiles(oid, element.getProject(), isObjectOid);
-        if (files == null) {
+        String oid = PsiUtils.getOidFromReferenceTag(ref);
+        if (oid == null) {
             return PsiReference.EMPTY_ARRAY;
         }
 
+        boolean isObjectOid = element instanceof XmlAttributeValue ?
+                MidPointUtils.isItObjectTypeOidAttribute(element) : false;
+
+        List<VirtualFile> files = ObjectFileBasedIndexImpl.getVirtualFiles(oid, element.getProject(), isObjectOid);
+
         Stream<VirtualFile> stream = files.stream();
         if (files.size() == 1 && isObjectOid) {
             stream = stream.filter(f -> !f.equals(element.getContainingFile().getVirtualFile()));
         }
 
         return stream
-                .map(f -> new OidReference(attrValue, f))
+                .map(f -> new OidReference((XmlElement) element, f))
                 .toList()
                 .toArray(new PsiReference[0]);
     }

diff --git a/studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/util/PsiUtils.java b/studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/util/PsiUtils.java
@@ -7,9 +7,7 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.impl.source.xml.TagNameReference;
-import com.intellij.psi.xml.XmlElement;
-import com.intellij.psi.xml.XmlFile;
-import com.intellij.psi.xml.XmlTag;
+import com.intellij.psi.xml.*;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.xml.namespace.QName;
@@ -176,4 +174,16 @@ public static String getOidFromReferenceTag(XmlTag reference) {
                 .findFirst()
                 .orElse(null);
     }
+
+    public static boolean isReferenceOidAttributeValue(PsiElement element) {
+        if (!(element instanceof XmlAttributeValue value)) {
+            return false;
+        }
+
+        if (!(value.getParent() instanceof XmlAttribute attribute)) {
+            return false;
+        }
+
+        return "oid".equals(attribute.getLocalName());
+    }
 }