From c1d5562e8639c813fcbd4ad8d935e1e33490ba14 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Thu, 21 Feb 2013 20:14:41 +0100
Subject: [PATCH] javafx: make tag types depend on hierarchy position
 (IDEA-101617)

---
 .../javaFX/fxml/JavaFXHighlightingTest.java   |  5 ++++
 .../javaFX/fxml/JavaFXNSDescriptor.java       | 20 ++++++-------
 .../plugins/javaFX/fxml/JavaFxPsiUtil.java    | 11 +------
 .../JavaFxDefaultTagInspection.java           |  7 +++--
 .../JavaFxClassBackedElementDescriptor.java   | 30 +++++++++++--------
 ...avaFxDefaultPropertyElementDescriptor.java | 14 ++++++---
 .../JavaFxPropertyElementDescriptor.java      |  8 +----
 .../highlighting/custom/_CustomVBox.java      | 16 ++++++++++
 .../custom/customComponent_Fields.fxml        |  5 ++++
 9 files changed, 69 insertions(+), 47 deletions(-)
 create mode 100644 plugins/javaFX/testData/highlighting/custom/_CustomVBox.java
 create mode 100644 plugins/javaFX/testData/highlighting/custom/customComponent_Fields.fxml

diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
index e12d14a0f7c0..666f905be3a2 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
@@ -119,6 +119,11 @@ public class JavaFXHighlightingTest extends DaemonAnalyzerTestCase {
     doTestNavigation("CustomVBox", "tf", "custom/" + getTestName(true) + ".fxml", "custom/CustomVBox.java");
   }
 
+  public void testCustomComponent_Fields() throws Exception {
+    configureByFiles(null, "custom/" + getTestName(true) + ".fxml", "custom/_CustomVBox.java");
+    doDoTest(false, false);
+  }
+
   private void doTestNavigation(String resultClassName, String resultFieldName) throws Exception {
     doTestNavigation(resultClassName, resultFieldName, ArrayUtil.EMPTY_STRING_ARRAY);
   }
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFXNSDescriptor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFXNSDescriptor.java
index ccc02fd95a11..7044f922600d 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFXNSDescriptor.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFXNSDescriptor.java
@@ -2,7 +2,9 @@ package org.jetbrains.plugins.javaFX.fxml;
 
 import com.intellij.codeInsight.daemon.Validator;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.xml.*;
+import com.intellij.psi.xml.XmlDocument;
+import com.intellij.psi.xml.XmlFile;
+import com.intellij.psi.xml.XmlTag;
 import com.intellij.util.ArrayUtil;
 import com.intellij.xml.XmlElementDescriptor;
 import com.intellij.xml.XmlNSDescriptor;
@@ -25,19 +27,15 @@ public class JavaFXNSDescriptor implements XmlNSDescriptor, Validator<XmlDocumen
 
     if (tag.getName().equals(FxmlConstants.FX_ROOT)) {
       return new JavaFxDefaultPropertyElementDescriptor(name, tag);
-    } else if (JavaFxPsiUtil.isClassTag(name)) {
-      return new JavaFxClassBackedElementDescriptor(name, tag);
     }
-    else {
-      final XmlTag parentTag = tag.getParentTag();
-      if (parentTag != null) {
-        final XmlElementDescriptor descriptor = parentTag.getDescriptor();
-        if (descriptor != null) {
-          return descriptor.getElementDescriptor(tag, parentTag);
-        }
+    final XmlTag parentTag = tag.getParentTag();
+    if (parentTag != null) {
+      final XmlElementDescriptor descriptor = parentTag.getDescriptor();
+      if (descriptor != null) {
+        return descriptor.getElementDescriptor(tag, parentTag);
       }
     }
-    return null;
+    return new JavaFxClassBackedElementDescriptor(name, tag);
   }
 
   @NotNull
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
index 27688c8d9984..ed042024c606 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
@@ -98,7 +98,7 @@ public class JavaFxPsiUtil {
 
       PsiFile file = tag.getContainingFile();
       for (String anImport : imports) {
-        if (StringUtil.endsWith(anImport, "." + name)) {
+        if (StringUtil.getShortName(anImport).equals(name)) {
           psiClass = psiFacade.findClass(anImport, file.getResolveScope()); 
         } else if (StringUtil.endsWith(anImport, ".*")) {
           psiClass = psiFacade.findClass(StringUtil.trimEnd(anImport, "*") + name, file.getResolveScope());
@@ -159,15 +159,6 @@ public class JavaFxPsiUtil {
     return null;
   }
 
-  public static boolean isClassTag(String name) {
-    final String shortName = StringUtil.getShortName(name);
-    final boolean capitalized = StringUtil.isCapitalized(name);
-    if (name.equals(shortName)) {
-      return capitalized;
-    }
-    return !capitalized;
-  }
-
   public static PsiMethod findPropertySetter(String attributeName, XmlTag context) {
     final String packageName = StringUtil.getPackageName(attributeName);
     if (context != null && !StringUtil.isEmptyOrSpaces(packageName)) {
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxDefaultTagInspection.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxDefaultTagInspection.java
index 25b96b203b9f..bedeaeec546e 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxDefaultTagInspection.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxDefaultTagInspection.java
@@ -19,8 +19,10 @@ import com.intellij.codeInspection.*;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.psi.*;
 import com.intellij.psi.xml.XmlTag;
+import com.intellij.xml.XmlElementDescriptor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.javaFX.fxml.JavaFxPsiUtil;
+import org.jetbrains.plugins.javaFX.fxml.descriptors.JavaFxPropertyElementDescriptor;
 
 /**
  * User: anna
@@ -35,11 +37,12 @@ public class JavaFxDefaultTagInspection extends XmlSuppressableInspectionTool{
       @Override
       public void visitXmlTag(XmlTag tag) {
         super.visitXmlTag(tag);
-        final String tagName = tag.getName();
-        if (!JavaFxPsiUtil.isClassTag(tagName)) {
+        final XmlElementDescriptor descriptor = tag.getDescriptor();
+        if (descriptor instanceof JavaFxPropertyElementDescriptor) {
           final XmlTag parentTag = tag.getParentTag();
           if (parentTag != null) {
             final String propertyName = JavaFxPsiUtil.getDefaultPropertyName(JavaFxPsiUtil.getTagClass(parentTag));
+            final String tagName = tag.getName();
             if (Comparing.strEqual(tagName, propertyName)) {
               holder.registerProblem(tag.getFirstChild(), 
                                      "Default property tag could be removed", 
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassBackedElementDescriptor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassBackedElementDescriptor.java
index 9e4eae7a3063..e450e00cbb5b 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassBackedElementDescriptor.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassBackedElementDescriptor.java
@@ -136,23 +136,27 @@ public class JavaFxClassBackedElementDescriptor implements XmlElementDescriptor,
   @Override
   public XmlElementDescriptor getElementDescriptor(XmlTag childTag, XmlTag contextTag) {
     final String name = childTag.getName();
-    if (JavaFxPsiUtil.isClassTag(name)) {
-      return new JavaFxClassBackedElementDescriptor(name, childTag);
+    if (FxmlConstants.FX_DEFAULT_ELEMENTS.contains(name)) {
+      return new JavaFxDefaultPropertyElementDescriptor(name, childTag);
     }
-    else {
-      final String shortName = StringUtil.getShortName(name);
-      if (!name.equals(shortName)) { //static property
-        final PsiMethod propertySetter = JavaFxPsiUtil.findPropertySetter(name, childTag);
-        if (propertySetter != null) {
-          return new JavaFxPropertyElementDescriptor(propertySetter.getContainingClass(), shortName, true);
-        }
+    final String shortName = StringUtil.getShortName(name);
+    if (!name.equals(shortName)) { //static property
+      final PsiMethod propertySetter = JavaFxPsiUtil.findPropertySetter(name, childTag);
+      if (propertySetter != null) {
+        return new JavaFxPropertyElementDescriptor(propertySetter.getContainingClass(), shortName, true);
+      }
+
+      final Project project = childTag.getProject();
+      if (JavaPsiFacade.getInstance(project).findClass(name, GlobalSearchScope.allScope(project)) == null) {
         return null;
       }
-      if (FxmlConstants.FX_DEFAULT_ELEMENTS.contains(name)) {
-        return new JavaFxDefaultPropertyElementDescriptor(name, childTag);
-      }
-      return myPsiClass != null ? new JavaFxPropertyElementDescriptor(myPsiClass, name, false) : null;
     }
+
+    final JavaFxPropertyElementDescriptor elementDescriptor = new JavaFxPropertyElementDescriptor(myPsiClass, name, false);
+    if (myPsiClass != null && elementDescriptor.getDeclaration() != null) {
+      return elementDescriptor;
+    }
+    return new JavaFxClassBackedElementDescriptor(name, childTag);
   }
 
   @Override
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxDefaultPropertyElementDescriptor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxDefaultPropertyElementDescriptor.java
index a103c8750664..e025f13a90c3 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxDefaultPropertyElementDescriptor.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxDefaultPropertyElementDescriptor.java
@@ -66,11 +66,17 @@ public class JavaFxDefaultPropertyElementDescriptor implements XmlElementDescrip
   @Nullable
   @Override
   public XmlElementDescriptor getElementDescriptor(XmlTag childTag, XmlTag contextTag) {
-    if (myName.equals(FxmlConstants.FX_DEFINE) || myName.equals(FxmlConstants.FX_ROOT)) {
-      final String name = childTag.getName();
-      if (JavaFxPsiUtil.isClassTag(name)) {
-        return new JavaFxClassBackedElementDescriptor(name, childTag);
+    final String name = childTag.getName();
+    if (myName.equals(FxmlConstants.FX_DEFINE)) {
+      return new JavaFxClassBackedElementDescriptor(name, childTag);
+    }
+
+    if (myName.equals(FxmlConstants.FX_ROOT)) {
+      final JavaFxClassBackedElementDescriptor tagDescriptor = getRootTagDescriptor(contextTag);
+      if (tagDescriptor != null) {
+        return tagDescriptor.getElementDescriptor(childTag, contextTag);
       }
+      return new JavaFxClassBackedElementDescriptor(name, childTag);
     }
     return null;
   }
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxPropertyElementDescriptor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxPropertyElementDescriptor.java
index 36a4c8563228..7cd6dff8942e 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxPropertyElementDescriptor.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxPropertyElementDescriptor.java
@@ -89,13 +89,7 @@ public class JavaFxPropertyElementDescriptor implements XmlElementDescriptor {
     if (FxmlConstants.FX_DEFAULT_ELEMENTS.contains(name)) {
       return new JavaFxDefaultPropertyElementDescriptor(name, childTag);
     }
-    if (JavaFxPsiUtil.isClassTag(name)) {
-      return new JavaFxClassBackedElementDescriptor(name, childTag);
-    }
-    else if (myPsiClass != null) {
-      return new JavaFxPropertyElementDescriptor(myPsiClass, name, name.indexOf('.') > 0);
-    }
-    return null;
+    return new JavaFxClassBackedElementDescriptor(name, childTag);
   }
 
   @Override
diff --git a/plugins/javaFX/testData/highlighting/custom/_CustomVBox.java b/plugins/javaFX/testData/highlighting/custom/_CustomVBox.java
new file mode 100644
index 000000000000..357677704951
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/custom/_CustomVBox.java
@@ -0,0 +1,16 @@
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.VBox;
+
+
+public class _CustomVBox extends VBox {
+    @FXML
+    private TextField tf;
+    @FXML
+    private Label lab1;
+    @FXML
+    void myMethod(){
+        lab1.setText(tf.getText());
+    }
+}
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/custom/customComponent_Fields.fxml b/plugins/javaFX/testData/highlighting/custom/customComponent_Fields.fxml
new file mode 100644
index 000000000000..af7ac78b9d5e
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/custom/customComponent_Fields.fxml
@@ -0,0 +1,5 @@
+<?import javafx.scene.layout.*?>
+<?import _CustomVBox?>
+<GridPane xmlns:fx="http://javafx.com/fxml" >
+  <_CustomVBox/>
+</GridPane>
\ No newline at end of file