chore: refactor Descriptor code

Author: adrienbaron

build.gradle

@@ -25,7 +25,7 @@ intellij {
 }
 
 group 'com.axellience'
-version '0.1.0'
+version '0.2.0'
 
 repositories {
     mavenCentral()

src/main/java/com/axellience/vuegwtplugin/VueGWTXmlExtension.java

@@ -1,17 +1,19 @@
 package com.axellience.vuegwtplugin;
 
+import com.axellience.vuegwtplugin.codeinsight.tags.VueGWTElementDescriptor;
 import com.axellience.vuegwtplugin.language.htmltemplate.HtmlTemplateLanguage;
-import com.axellience.vuegwtplugin.util.VueGWTComponentAnnotationUtil;
 import com.axellience.vuegwtplugin.util.VueGWTPluginUtil;
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.util.TextRange;
+import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.impl.source.xml.SchemaPrefix;
 import com.intellij.psi.impl.source.xml.TagNameReference;
 import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.psi.xml.XmlDocument;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.xml.HtmlXmlExtension;
+import com.intellij.xml.XmlElementDescriptor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -68,22 +70,23 @@ public String[][] getNamespacesFromDocument(XmlDocument parent, boolean declarat
   @Nullable
   @Override
   public TagNameReference createTagNameReference(ASTNode astNode, boolean b) {
-    String tagName = astNode.getText(); // Tag name of the current element
+    PsiElement psiElement = astNode.getTreeParent().getPsi();
+    if (!(psiElement instanceof XmlTag)) {
+      return super.createTagNameReference(astNode, b);
+    }
+
+    XmlElementDescriptor descriptor = ((XmlTag) psiElement).getDescriptor();
+    if (!(descriptor instanceof VueGWTElementDescriptor)) {
+      return super.createTagNameReference(astNode, b);
+    }
 
-    PsiFile templateFile = astNode.getTreeParent().getPsi().getContainingFile();
-    return
-        VueGWTPluginUtil
-            .findJavaFromTemplate(templateFile)
-            .flatMap(VueGWTComponentAnnotationUtil::getComponentAnnotationFromJavaFile)
-            .flatMap(
-                annotation -> VueGWTComponentAnnotationUtil
-                    .getImportedComponentTemplateFromAnnotationComponent(annotation, tagName)
-            )
-            .map(
-                componentTemplate ->
-                    (TagNameReference) new VueGWTTagNameReference(astNode, componentTemplate, b)
-            )
-            .orElse(super.createTagNameReference(astNode, b));
+    return ((VueGWTElementDescriptor) descriptor)
+        .getHtmlTemplate()
+        .map(
+            componentTemplate ->
+                (TagNameReference) new VueGWTTagNameReference(astNode, componentTemplate, b)
+        )
+        .orElse(super.createTagNameReference(astNode, b));
   }
 
   @Override

src/main/java/com/axellience/vuegwtplugin/codeinsight/attributes/VueGWTAttributeProvider.java

@@ -4,6 +4,7 @@
 import com.axellience.vuegwtplugin.util.VueGWTPluginUtil;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
 import com.intellij.psi.impl.source.html.dtd.HtmlNSDescriptorImpl;
 import com.intellij.psi.impl.source.xml.XmlDescriptorUtil;
 import com.intellij.psi.xml.XmlAttribute;
@@ -15,6 +16,7 @@
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import org.jetbrains.annotations.Nullable;
 
@@ -56,12 +58,16 @@ public XmlAttributeDescriptor getAttributeDescriptor(XmlAttribute attribute) {
     return getAttributeDescriptor(attribute.getName(), attribute.getParent());
   }
 
-  public List<XmlAttributeDescriptor> getProps() {
+  public List<VueGWTAttributeDescriptor> getProps() {
     return Arrays.stream(componentClass.getAllFields())
         .map(VueGWTAttributeDescriptor::new)
         .collect(Collectors.toList());
   }
 
+  public Optional<PsiFile> getHtmlTemplate() {
+    return VueGWTPluginUtil.findHtmlTemplate(componentClass.getContainingFile());
+  }
+
   @Override
   public int getContentType() {
     return XmlElementDescriptor.CONTENT_TYPE_ANY;
@@ -93,7 +99,7 @@ public String getName(PsiElement context) {
     if (context instanceof XmlTag) {
       return ((XmlTag) context).getName();
     }
-    ;
+
     return this.getName();
   }
 

src/main/java/com/axellience/vuegwtplugin/codeinsight/tags/VueGWTElementDescriptor.java

@@ -21,7 +21,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public class VueGWTTagProvider implements XmlElementDescriptorProvider, XmlTagNameProvider {
+public class VueGWTElementDescriptorProvider implements XmlElementDescriptorProvider,
+    XmlTagNameProvider {
 
   @Nullable
   @Override

…/codeinsight/tags/VueGWTTagProvider.java …ags/VueGWTElementDescriptorProvider.javasrc/main/java/com/axellience/vuegwtplugin/codeinsight/tags/VueGWTTagProvider.java renamed to src/main/java/com/axellience/vuegwtplugin/codeinsight/tags/VueGWTElementDescriptorProvider.java src/main/java/com/axellience/vuegwtplugin/codeinsight/tags/VueGWTTagProvider.java renamed to src/main/java/com/axellience/vuegwtplugin/codeinsight/tags/VueGWTElementDescriptorProvider.java

@@ -43,21 +43,6 @@ public static Optional<PsiAnnotation> getComponentAnnotationFromPsiClass(
     return Optional.empty();
   }
 
-  public static Optional<PsiFile> getImportedComponentTemplateFromAnnotationComponent(
-      PsiAnnotation componentAnnotation,
-      String tagName) {
-
-    Set<PsiClassType> importedComponentsClassType = getImportedComponentsClassTypeFromComponentAnnotation(
-        componentAnnotation);
-
-    return importedComponentsClassType.stream()
-        .filter(psiClassType -> VueGWTPluginUtil.componentToTagName(psiClassType).equals(tagName))
-        .findFirst()
-        .map(PsiClassType::resolve)
-        .map(PsiClass::getContainingFile)
-        .flatMap(VueGWTPluginUtil::findHtmlTemplate);
-  }
-
   public static Optional<PsiClassType> getImportedComponentClassTypeFromComponentAnnotation(
       PsiAnnotation componentAnnotation,
       String tagName) {

src/main/java/com/axellience/vuegwtplugin/util/VueGWTComponentAnnotationUtil.java

@@ -63,19 +63,6 @@ public static Optional<PsiJavaFile> findJavaFromTemplate(PsiFile templateFile) {
     return Optional.of((PsiJavaFile) file);
   }
 
-  public static Optional<PsiClass> getComponentClassFromFile(PsiJavaFile psiJavaFile) {
-    for (PsiClass psiClass : psiJavaFile.getClasses()) {
-      PsiAnnotation[] annotations = psiClass.getAnnotations();
-      for (PsiAnnotation annotation : annotations) {
-        if (COMPONENT_QUALIFIED_NAME.equals(annotation.getQualifiedName())) {
-          return Optional.of(psiClass);
-        }
-      }
-    }
-
-    return Optional.empty();
-  }
-
   public static String getTemplateNameFrom(PsiFile javaFile) {
     return javaFile.getName().replaceAll("(.*)\\.java", "$1.html");
   }

src/main/java/com/axellience/vuegwtplugin/util/VueGWTPluginUtil.java

@@ -1,7 +1,7 @@
 <idea-plugin>
   <id>com.axellience.vuegwt</id>
   <name>Vue GWT</name>
-  <version>0.1.0</version>
+  <version>0.2.0</version>
   <vendor email="support@axellience.com" url="http://www.genmymodel.com">Axellience</vendor>
 
   <description><![CDATA[
@@ -13,6 +13,7 @@
     <ul>
       <li>Run the Annotation Processor when a template or a component class is changed</li>
       <li>Allow navigation between components in the template</li>
+      <li>Add @Prop names completion in templates and allow navigation to Java definition</li>
       <li>Allow 2-way navigation between the template and the Java class</li>
       <li>Allow one intention to create the template for a Vue Component class</li>
       <li>Add support for scoped SCSS in templates</li>
@@ -21,6 +22,16 @@
     ]]></description>
 
   <change-notes><![CDATA[
+  <strong>v0.2.0</strong>
+  <ul>
+    <li>Change template recompiling handling to run the Java compiler instead of just touching the Java file</li>
+    <li>Add support for @Prop completion in templates</li>
+    <li>Add support for @Prop navigation in templates</li>
+    <li>Suppress unknown property for @Prop in templates</li>
+    <li>Add support for component name completion in templates based on imports</li>
+    <li>Suppress self closing tag warning in templates</li>
+  </ul>
+  <br/>
   <strong>v0.1.0</strong>
   <p>To upgrade to this version it is recommended to disable IntelliJ auto compilation feature as it is not needed anymore</p>
   <ul>
@@ -74,8 +85,10 @@
 
 
     <xml.xmlExtension implementation="com.axellience.vuegwtplugin.VueGWTXmlExtension"/>
-    <xml.tagNameProvider implementation="com.axellience.vuegwtplugin.codeinsight.tags.VueGWTTagProvider"/>
-    <xml.elementDescriptorProvider implementation="com.axellience.vuegwtplugin.codeinsight.tags.VueGWTTagProvider"/>
+    <xml.tagNameProvider
+      implementation="com.axellience.vuegwtplugin.codeinsight.tags.VueGWTElementDescriptorProvider"/>
+    <xml.elementDescriptorProvider
+      implementation="com.axellience.vuegwtplugin.codeinsight.tags.VueGWTElementDescriptorProvider"/>
 
     <fileTypeFactory
       implementation="com.axellience.vuegwtplugin.language.VueGWTFileTypeFactory"/>