From d4aa97fc4ece319e466c5d8f2d67283c38d7e837 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 31 Jan 2013 19:23:30 +0400
Subject: [PATCH] javafx: fx:define subtags

---
 .../JavaFxDefaultPropertyElementDescriptor.java           | 8 +++++++-
 plugins/javaFX/testData/highlighting/definedElements.fxml | 8 ++++++++
 .../plugins/javaFX/fxml/JavaFXHighlightingTest.java       | 4 ++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 plugins/javaFX/testData/highlighting/definedElements.fxml

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 674a55ad0b55..f63e9f8abcee 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,7 +66,13 @@ public class JavaFxDefaultPropertyElementDescriptor implements XmlElementDescrip
   @Nullable
   @Override
   public XmlElementDescriptor getElementDescriptor(XmlTag childTag, XmlTag contextTag) {
-    return null;  //To change body of implemented methods use File | Settings | File Templates.
+    if (myName.equals(FxmlConstants.FX_DEFINE)) {
+      final String name = childTag.getName();
+      if (JavaFxPsiUtil.isClassTag(name)) {
+        return new JavaFxClassBackedElementDescriptor(name, childTag);
+      }
+    }
+    return null;
   }
 
   @Override
diff --git a/plugins/javaFX/testData/highlighting/definedElements.fxml b/plugins/javaFX/testData/highlighting/definedElements.fxml
new file mode 100644
index 000000000000..c080cdfcd5a3
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/definedElements.fxml
@@ -0,0 +1,8 @@
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.Label?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <fx:define>
+    <Label fx:id="lbl" text="MyText" GridPane.rowIndex="1"/>
+  </fx:define>
+  <fx:reference source="lbl" text="bar" layoutX="10.0" layoutY="10.0" textFill="green"/>
+</GridPane>
diff --git a/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java b/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
index e04cd6e35778..36f720e473b6 100644
--- a/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
+++ b/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
@@ -126,6 +126,10 @@ public class JavaFXHighlightingTest extends DaemonAnalyzerTestCase {
     doTest();
   }
 
+  public void testDefinedElements() throws Exception {
+    doTest();
+  }
+
   public void testIncludeBtn() throws Exception {
     configureByFiles(null, getTestName(true) + ".fxml", "btn.fxml");
     doDoTest(false, false);