Snapshot of commit 84dc01e773388c2c72a1fc437f313dd5747e7809

from branch master of git://git.jetbrains.org/idea/community.git

85 files changed, 686 insertions, 0 deletions

diff --git a/plugins/javaFX/testData/completion/availablePositions.fxml b/plugins/javaFX/testData/completion/availablePositions.fxml
new file mode 100644
index 000000000000..507a35ad2fcb
--- /dev/null
+++ b/plugins/javaFX/testData/completion/availablePositions.fxml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml" alignment="<caret>">
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/availablePositions_after.fxml b/plugins/javaFX/testData/completion/availablePositions_after.fxml
new file mode 100644
index 000000000000..cc95a4106905
--- /dev/null
+++ b/plugins/javaFX/testData/completion/availablePositions_after.fxml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml" alignment="BASELINE_CENTER">
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/classDefaultProperty.fxml b/plugins/javaFX/testData/completion/classDefaultProperty.fxml
new file mode 100644
index 000000000000..99f90000e9d4
--- /dev/null
+++ b/plugins/javaFX/testData/completion/classDefaultProperty.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+    <<caret>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/classDefaultProperty_after.fxml b/plugins/javaFX/testData/completion/classDefaultProperty_after.fxml
new file mode 100644
index 000000000000..6faf31ba548a
--- /dev/null
+++ b/plugins/javaFX/testData/completion/classDefaultProperty_after.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+    <Button
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/classInsertImport.fxml b/plugins/javaFX/testData/completion/classInsertImport.fxml
new file mode 100644
index 000000000000..858c9f8145db
--- /dev/null
+++ b/plugins/javaFX/testData/completion/classInsertImport.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <children>
+    <<caret>
+  </children>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/classInsertImport_after.fxml b/plugins/javaFX/testData/completion/classInsertImport_after.fxml
new file mode 100644
index 000000000000..07d99b9ea84d
--- /dev/null
+++ b/plugins/javaFX/testData/completion/classInsertImport_after.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.Button?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <children>
+    <Button
+  </children>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/classInsideList.fxml b/plugins/javaFX/testData/completion/classInsideList.fxml
new file mode 100644
index 000000000000..7a271400d0c9
--- /dev/null
+++ b/plugins/javaFX/testData/completion/classInsideList.fxml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <children>
+    <<caret>
+  </children>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/classInsideList_after.fxml b/plugins/javaFX/testData/completion/classInsideList_after.fxml
new file mode 100644
index 000000000000..559bf304e89b
--- /dev/null
+++ b/plugins/javaFX/testData/completion/classInsideList_after.fxml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <children>
+    <Button
+  </children>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/constants.fxml b/plugins/javaFX/testData/completion/constants.fxml
new file mode 100644
index 000000000000..fe1b4623afb8
--- /dev/null
+++ b/plugins/javaFX/testData/completion/constants.fxml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.Double?>
+
+<GridPane xmlns:fx="http://javafx.com/fxml" alignment="center">
+  <Button>
+    <minHeight><Double fx:constant="<caret>"/></minHeight>
+  </Button>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/constants_after.fxml b/plugins/javaFX/testData/completion/constants_after.fxml
new file mode 100644
index 000000000000..fcd8fd94c5a9
--- /dev/null
+++ b/plugins/javaFX/testData/completion/constants_after.fxml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.Double?>
+
+<GridPane xmlns:fx="http://javafx.com/fxml" alignment="center">
+  <Button>
+    <minHeight><Double fx:constant="NEGATIVE_INFINITY"/></minHeight>
+  </Button>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/defaultProperty.fxml b/plugins/javaFX/testData/completion/defaultProperty.fxml
new file mode 100644
index 000000000000..26a96fdaf774
--- /dev/null
+++ b/plugins/javaFX/testData/completion/defaultProperty.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <HBox <caret> GridPane.rowIndex="4"/>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/defaultProperty_after.fxml b/plugins/javaFX/testData/completion/defaultProperty_after.fxml
new file mode 100644
index 000000000000..4ed0392690cb
--- /dev/null
+++ b/plugins/javaFX/testData/completion/defaultProperty_after.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <HBox fx:id="" GridPane.rowIndex="4"/>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/defaultTag.fxml b/plugins/javaFX/testData/completion/defaultTag.fxml
new file mode 100644
index 000000000000..19c1262e5e23
--- /dev/null
+++ b/plugins/javaFX/testData/completion/defaultTag.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <<caret>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/defaultTag_after.fxml b/plugins/javaFX/testData/completion/defaultTag_after.fxml
new file mode 100644
index 000000000000..71eafcec68e6
--- /dev/null
+++ b/plugins/javaFX/testData/completion/defaultTag_after.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <fx:script
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/expressionBinding.fxml b/plugins/javaFX/testData/completion/expressionBinding.fxml
new file mode 100644
index 000000000000..91b390e5bc68
--- /dev/null
+++ b/plugins/javaFX/testData/completion/expressionBinding.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.Label?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <TextField fx:id="textField"/>
+  <Label text="${textField.<caret>}"/>
+</GridPane>
diff --git a/plugins/javaFX/testData/completion/expressionBinding_after.fxml b/plugins/javaFX/testData/completion/expressionBinding_after.fxml
new file mode 100644
index 000000000000..448195701a3b
--- /dev/null
+++ b/plugins/javaFX/testData/completion/expressionBinding_after.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.Label?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <TextField fx:id="textField"/>
+  <Label text="${textField.text}"/>
+</GridPane>
diff --git a/plugins/javaFX/testData/completion/factoryMethods.fxml b/plugins/javaFX/testData/completion/factoryMethods.fxml
new file mode 100644
index 000000000000..b10f088fbc38
--- /dev/null
+++ b/plugins/javaFX/testData/completion/factoryMethods.fxml
@@ -0,0 +1,10 @@
+<?import javafx.scene.layout.GridPane?>
+<?import java.lang.String?>
+<?import javafx.collections.FXCollections?>
+<GridPane xmlns:fx="http://javafx.com/fxml" fx:controller="sample.Controller">
+  <fx:define>
+    <FXCollections fx:factory="<caret>">
+      <String fx:value="A"/>
+    </FXCollections>
+  </fx:define>
+</GridPane>
diff --git a/plugins/javaFX/testData/completion/factoryMethods_after.fxml b/plugins/javaFX/testData/completion/factoryMethods_after.fxml
new file mode 100644
index 000000000000..6be1200c2452
--- /dev/null
+++ b/plugins/javaFX/testData/completion/factoryMethods_after.fxml
@@ -0,0 +1,10 @@
+<?import javafx.scene.layout.GridPane?>
+<?import java.lang.String?>
+<?import javafx.collections.FXCollections?>
+<GridPane xmlns:fx="http://javafx.com/fxml" fx:controller="sample.Controller">
+  <fx:define>
+    <FXCollections fx:factory="observableArrayList">
+      <String fx:value="A"/>
+    </FXCollections>
+  </fx:define>
+</GridPane>
diff --git a/plugins/javaFX/testData/completion/listPropertyTag.fxml b/plugins/javaFX/testData/completion/listPropertyTag.fxml
new file mode 100644
index 000000000000..99f90000e9d4
--- /dev/null
+++ b/plugins/javaFX/testData/completion/listPropertyTag.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+    <<caret>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/listPropertyTag_after.fxml b/plugins/javaFX/testData/completion/listPropertyTag_after.fxml
new file mode 100644
index 000000000000..3114b472c34e
--- /dev/null
+++ b/plugins/javaFX/testData/completion/listPropertyTag_after.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+    <children
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/readOnly.fxml b/plugins/javaFX/testData/completion/readOnly.fxml
new file mode 100644
index 000000000000..656ece4abe8f
--- /dev/null
+++ b/plugins/javaFX/testData/completion/readOnly.fxml
@@ -0,0 +1,6 @@
+
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.Region?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <Region <caret>/>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/referencedAttributes.fxml b/plugins/javaFX/testData/completion/referencedAttributes.fxml
new file mode 100644
index 000000000000..ac36d9d0f84b
--- /dev/null
+++ b/plugins/javaFX/testData/completion/referencedAttributes.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="lab" text="MyText" GridPane.rowIndex="1"/>
+  </fx:define>
+  <fx:reference source="lab" <caret>/>
+</GridPane>
diff --git a/plugins/javaFX/testData/completion/referencedAttributes_after.fxml b/plugins/javaFX/testData/completion/referencedAttributes_after.fxml
new file mode 100644
index 000000000000..1e9128c4cc8d
--- /dev/null
+++ b/plugins/javaFX/testData/completion/referencedAttributes_after.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="lab" text="MyText" GridPane.rowIndex="1"/>
+  </fx:define>
+  <fx:reference source="lab" text=""/>
+</GridPane>
diff --git a/plugins/javaFX/testData/completion/simplePropertyTag.fxml b/plugins/javaFX/testData/completion/simplePropertyTag.fxml
new file mode 100644
index 000000000000..feb00169f11c
--- /dev/null
+++ b/plugins/javaFX/testData/completion/simplePropertyTag.fxml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <Label>
+    <<caret>
+  </Label>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/simplePropertyTag_after.fxml b/plugins/javaFX/testData/completion/simplePropertyTag_after.fxml
new file mode 100644
index 000000000000..c55eb3c4ccd4
--- /dev/null
+++ b/plugins/javaFX/testData/completion/simplePropertyTag_after.fxml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <Label>
+    <text
+  </Label>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/staticProperties.fxml b/plugins/javaFX/testData/completion/staticProperties.fxml
new file mode 100644
index 000000000000..50399a15affe
--- /dev/null
+++ b/plugins/javaFX/testData/completion/staticProperties.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+    <HBox <caret> GridPane.rowIndex="4"/>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/staticPropertiesEnumValue.fxml b/plugins/javaFX/testData/completion/staticPropertiesEnumValue.fxml
new file mode 100644
index 000000000000..13fc3befe82a
--- /dev/null
+++ b/plugins/javaFX/testData/completion/staticPropertiesEnumValue.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+    <HBox GridPane.hgrow="<caret>"/>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/staticPropertiesEnumValue_after.fxml b/plugins/javaFX/testData/completion/staticPropertiesEnumValue_after.fxml
new file mode 100644
index 000000000000..0db560403195
--- /dev/null
+++ b/plugins/javaFX/testData/completion/staticPropertiesEnumValue_after.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+    <HBox GridPane.hgrow="ALWAYS"/>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/staticPropertiesTag.fxml b/plugins/javaFX/testData/completion/staticPropertiesTag.fxml
new file mode 100644
index 000000000000..99f90000e9d4
--- /dev/null
+++ b/plugins/javaFX/testData/completion/staticPropertiesTag.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+    <<caret>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/staticPropertiesTag_after.fxml b/plugins/javaFX/testData/completion/staticPropertiesTag_after.fxml
new file mode 100644
index 000000000000..babfa9dcc6fd
--- /dev/null
+++ b/plugins/javaFX/testData/completion/staticPropertiesTag_after.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+    <GridPane.columnIndex
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/staticProperties_after.fxml b/plugins/javaFX/testData/completion/staticProperties_after.fxml
new file mode 100644
index 000000000000..a7ae79995e4f
--- /dev/null
+++ b/plugins/javaFX/testData/completion/staticProperties_after.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+    <HBox GridPane.columnIndex="" GridPane.rowIndex="4"/>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/variableCompletion.fxml b/plugins/javaFX/testData/completion/variableCompletion.fxml
new file mode 100644
index 000000000000..efe9eed0a84c
--- /dev/null
+++ b/plugins/javaFX/testData/completion/variableCompletion.fxml
@@ -0,0 +1,10 @@
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Tooltip?>
+<GridPane fx:controller="sample.Controller" xmlns:fx="http://javafx.com/fxml">
+  <fx:define>
+    <Tooltip text="tooltip" fx:id="t"/>
+  </fx:define>
+
+  <Button onAction="#sayHello" text="Hello" fx:id="b1" tooltip="$<caret>" />
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/variableCompletion_after.fxml b/plugins/javaFX/testData/completion/variableCompletion_after.fxml
new file mode 100644
index 000000000000..911cb69083e7
--- /dev/null
+++ b/plugins/javaFX/testData/completion/variableCompletion_after.fxml
@@ -0,0 +1,10 @@
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Tooltip?>
+<GridPane fx:controller="sample.Controller" xmlns:fx="http://javafx.com/fxml">
+  <fx:define>
+    <Tooltip text="tooltip" fx:id="t"/>
+  </fx:define>
+
+  <Button onAction="#sayHello" text="Hello" fx:id="b1" tooltip="$t" />
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/CoercedTypes.fxml b/plugins/javaFX/testData/highlighting/CoercedTypes.fxml
new file mode 100644
index 000000000000..d6ffb28a0fd5
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/CoercedTypes.fxml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.scene.layout.*?>
+<?import java.util.*?>
+<?import java.net.*?>
+<AnchorPane id="AnchorPane" maxHeight="-Infinity" maxWidth="-Infinity" xmlns:fx="http://javafx.com/fxml">
+  <children>
+    <<error descr="Unable to coerce java.util.ArrayList to javafx.scene.Node">ArrayList</error>/>
+  </children>
+  <stylesheets>
+    <URL value="test.css" />
+  </stylesheets>
+</AnchorPane>
diff --git a/plugins/javaFX/testData/highlighting/Controller.fxml b/plugins/javaFX/testData/highlighting/Controller.fxml
new file mode 100644
index 000000000000..c83c1861f6b5
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/Controller.fxml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.scene.layout.*?>
+<AnchorPane id="AnchorPane" xmlns:fx="http://javafx.com/fxml" fx:controller="java.util.ArrayList">
+  <children>
+    <AnchorPane id="anchorPane2">
+      <children>
+      </children>
+    </AnchorPane>
+  </children>
+</AnchorPane>
diff --git a/plugins/javaFX/testData/highlighting/ControllerIdRef.fxml b/plugins/javaFX/testData/highlighting/ControllerIdRef.fxml
new file mode 100644
index 000000000000..90b7dcc85280
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/ControllerIdRef.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane fx:controller="ControllerIdRefController" xmlns:fx="http://javafx.com/fxml">
+    <Text fx:id="access<caret>Text"/>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/ControllerIdRefController.java b/plugins/javaFX/testData/highlighting/ControllerIdRefController.java
new file mode 100644
index 000000000000..050f592009d8
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/ControllerIdRefController.java
@@ -0,0 +1,4 @@
+import javafx.scene.text.Text;
+public class ControllerIdRefController {
+  public Text accessText;
+}
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/PackageLocalController.fxml b/plugins/javaFX/testData/highlighting/PackageLocalController.fxml
new file mode 100644
index 000000000000..ce7f1ce62bcb
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/PackageLocalController.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<GridPane fx:controller=<error descr="'PackageLocalController' should be public">"PackageLocalController"</error> xmlns:fx="http://javafx.com/fxml">
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/PackageLocalController.java b/plugins/javaFX/testData/highlighting/PackageLocalController.java
new file mode 100644
index 000000000000..4899276eb770
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/PackageLocalController.java
@@ -0,0 +1 @@
+class PackageLocalController{}
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/UnresolvedTopLevelController.fxml b/plugins/javaFX/testData/highlighting/UnresolvedTopLevelController.fxml
new file mode 100644
index 000000000000..e8bef2963ea3
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/UnresolvedTopLevelController.fxml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.scene.layout.*?>
+<AnchorPane id="AnchorPane" xmlns:fx="http://javafx.com/fxml" fx:controller="<error descr="Cannot resolve class or package 'unknownPackage'">unknownPackage</error>.<error descr="Cannot resolve class 'UnknownClass'">UnknownClass</error>">
+  <children>
+    <AnchorPane id="anchorPane2" <error descr="fx:controller can only be applied to root element">fx:controller</error>="java.util.ArrayList">
+      <children>
+      </children>
+    </AnchorPane>
+  </children>
+</AnchorPane>
diff --git a/plugins/javaFX/testData/highlighting/appIcon.png b/plugins/javaFX/testData/highlighting/appIcon.png
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/appIcon.png
diff --git a/plugins/javaFX/testData/highlighting/btn.fxml b/plugins/javaFX/testData/highlighting/btn.fxml
new file mode 100644
index 000000000000..6444aa8b4cda
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/btn.fxml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Button/>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/constantNavigation.fxml b/plugins/javaFX/testData/highlighting/constantNavigation.fxml
new file mode 100644
index 000000000000..c32f2fa34953
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/constantNavigation.fxml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.Double?>
+
+<GridPane xmlns:fx="http://javafx.com/fxml" alignment="center">
+  <Button>
+    <minHeight><Double fx:constant="NEGATIVE_INFI<caret>NITY"/></minHeight>
+  </Button>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/defaultTagInList.fxml b/plugins/javaFX/testData/highlighting/defaultTagInList.fxml
new file mode 100644
index 000000000000..b4bfe857567d
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/defaultTagInList.fxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.Label?>
+
+<GridPane fx:id="gp"
+          xmlns:fx="http://javafx.com/fxml" alignment="center" hgap="10" vgap="10">
+  <children>
+    <fx:script>
+    </fx:script>
+    <fx:<error descr="Cannot resolve symbol 'fx:id'">id</error>/>
+    <Label fx:id="label" GridPane.rowIndex="1" <error descr="Attribute fx:script is not allowed here">fx:script</error>=""/>
+  </children>
+</GridPane>
diff --git a/plugins/javaFX/testData/highlighting/defaultTagProperties.fxml b/plugins/javaFX/testData/highlighting/defaultTagProperties.fxml
new file mode 100644
index 000000000000..a7d8934623a0
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/defaultTagProperties.fxml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.Label?>
+
+<GridPane fx:id="gp"
+          xmlns:fx="http://javafx.com/fxml" alignment="center" hgap="10" vgap="10">
+  <fx:script>
+  </fx:script>
+  <fx:<error descr="Cannot resolve symbol 'fx:id'">id</error>/>
+  <Label fx:id="label" GridPane.rowIndex="1" <error descr="Attribute fx:script is not allowed here">fx:script</error>=""/>
+</GridPane>
diff --git a/plugins/javaFX/testData/highlighting/defineAttributes.fxml b/plugins/javaFX/testData/highlighting/defineAttributes.fxml
new file mode 100644
index 000000000000..c582e617fc04
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/defineAttributes.fxml
@@ -0,0 +1,5 @@
+<?import javafx.scene.layout.GridPane?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <fx:define <error descr="Attribute GridPane.halignment is not allowed here">GridPane.halignment</error>="CENTER" />
+  <fx:define/>
+</GridPane>
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/testData/highlighting/enumNavigation.fxml b/plugins/javaFX/testData/highlighting/enumNavigation.fxml
new file mode 100644
index 000000000000..909b551a3e99
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/enumNavigation.fxml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+
+<GridPane xmlns:fx="http://javafx.com/fxml" alignment="cent<caret>er">
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/enumValues.fxml b/plugins/javaFX/testData/highlighting/enumValues.fxml
new file mode 100644
index 000000000000..251ead16c477
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/enumValues.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+
+<GridPane xmlns:fx="http://javafx.com/fxml" alignment="center">
+    <HBox alignment="<error descr="Cannot resolve symbol 'UNKNOWN'">UNKNOWN</error>"/>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/expressionBinding.fxml b/plugins/javaFX/testData/highlighting/expressionBinding.fxml
new file mode 100644
index 000000000000..448195701a3b
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/expressionBinding.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.Label?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <TextField fx:id="textField"/>
+  <Label text="${textField.text}"/>
+</GridPane>
diff --git a/plugins/javaFX/testData/highlighting/fQNtagNames.fxml b/plugins/javaFX/testData/highlighting/fQNtagNames.fxml
new file mode 100644
index 000000000000..6137837891f2
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/fQNtagNames.fxml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<javafx.scene.layout.AnchorPane xmlns:fx="http://javafx.com/fxml">
+</javafx.scene.layout.AnchorPane>
diff --git a/plugins/javaFX/testData/highlighting/handlerWithoutController.fxml b/plugins/javaFX/testData/highlighting/handlerWithoutController.fxml
new file mode 100644
index 000000000000..2662596e3f7d
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/handlerWithoutController.fxml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.Button?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <Button onAction= <error descr="No controller specified for top level element">"#foo"</error> text="foo" fx:id="b1" />
+</GridPane>
diff --git a/plugins/javaFX/testData/highlighting/handlerWithoutPageLanguage.fxml b/plugins/javaFX/testData/highlighting/handlerWithoutPageLanguage.fxml
new file mode 100644
index 000000000000..987607f5b261
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/handlerWithoutPageLanguage.fxml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.Button?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <Button onAction=<error descr="Page language not specified.">"foo"</error> text="foo" fx:id="b1" />
+</GridPane>
diff --git a/plugins/javaFX/testData/highlighting/imageIcon.fxml b/plugins/javaFX/testData/highlighting/imageIcon.fxml
new file mode 100644
index 000000000000..76d655bdbed7
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/imageIcon.fxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.image.*?>
+
+<AnchorPane xmlns:fx="http://javafx.com/fxml">
+  <children>
+    <ImageView>
+      <image>
+        <Image url="@appIcon.png"/>
+      </image>
+    </ImageView>
+    <ImageView>
+      <image>
+        <Image url="appIcon.png"/>
+      </image>
+    </ImageView>
+    <ImageView>
+      <image>
+        <Image url="@<error descr="Cannot resolve file 'unknownIcon.png'">unknownIcon.png</error>"/>
+      </image>
+    </ImageView>
+  </children>
+</AnchorPane>
diff --git a/plugins/javaFX/testData/highlighting/includeBtn.fxml b/plugins/javaFX/testData/highlighting/includeBtn.fxml
new file mode 100644
index 000000000000..5203321be583
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/includeBtn.fxml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.image.*?>
+
+<AnchorPane xmlns:fx="http://javafx.com/fxml">
+  <children>
+    <fx:include source="btn.fxml"/>
+    <fx:include source="<error descr="Cannot resolve file 'btn1.fxml'">btn1.fxml</error>"/>
+  </children>
+</AnchorPane>
diff --git a/plugins/javaFX/testData/highlighting/instantiationAcceptance.fxml b/plugins/javaFX/testData/highlighting/instantiationAcceptance.fxml
new file mode 100644
index 000000000000..4a538b7bd0da
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/instantiationAcceptance.fxml
@@ -0,0 +1,9 @@
+<?import javafx.scene.layout.GridPane?>
+<?import java.io.File?>
+<?import javafx.scene.control.Label?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <fx:define>
+    <<error descr="Unable to instantiate">File</error>/>
+    <Label/>
+  </fx:define>
+</GridPane>
diff --git a/plugins/javaFX/testData/highlighting/loginForm.fxml b/plugins/javaFX/testData/highlighting/loginForm.fxml
new file mode 100644
index 000000000000..5c90c09b90da
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/loginForm.fxml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.scene.layout.*?>
+<AnchorPane id="AnchorPane" maxHeight="-Infinity" maxWidth="-Infinity" <error descr="Attribute unknownAttr is not allowed here">unknownAttr</error>="val" xmlns:fx="http://javafx.com/fxml">
+  <children>
+    <AnchorPane id="anchorPane2" prefHeight="300.0" AnchorPane.bottomAnchor="200.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <children>
+      </children>
+    </AnchorPane>
+  </children>
+  <stylesheets/>
+  <<error descr="Cannot resolve symbol 'UnknownClass'">UnknownClass</error>/>
+  <<error descr="Cannot resolve symbol 'unknownField'">unknownField</error>/>
+</AnchorPane>
diff --git a/plugins/javaFX/testData/highlighting/propertyElementsWithAnyAttributes.fxml b/plugins/javaFX/testData/highlighting/propertyElementsWithAnyAttributes.fxml
new file mode 100644
index 000000000000..091d1a3d597c
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/propertyElementsWithAnyAttributes.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.Button?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <Button  text="Press Me" fx:id="b1" >
+    <properties pp1="pp1_value" pp2="pp2_value" foo="bar"/>
+  </Button>
+</GridPane>
diff --git a/plugins/javaFX/testData/highlighting/propertyWithoutField.fxml b/plugins/javaFX/testData/highlighting/propertyWithoutField.fxml
new file mode 100644
index 000000000000..7301933f4fde
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/propertyWithoutField.fxml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.SplitPane?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <SplitPane id="Split Pane" dividerPositions="0.23661270236612703" focusTraversable="true" minHeight="550.0"
+             minWidth="800.0" prefHeight="550.0" prefWidth="800.0" />
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/readOnly.fxml b/plugins/javaFX/testData/highlighting/readOnly.fxml
new file mode 100644
index 000000000000..cb3413474368
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/readOnly.fxml
@@ -0,0 +1,8 @@
+<?import javafx.scene.layout.AnchorPane?>
+<?import java.lang.String?>
+<AnchorPane id="AnchorPane" xmlns:fx="http://javafx.com/fxml" stylesheets="mystyle.css" <error descr="Property 'backgroundFills' is read-only">backgroundFills=""</error>>
+  <stylesheets>
+    <String fx:value="mystyle.css"/>
+  </stylesheets>
+
+</AnchorPane>
diff --git a/plugins/javaFX/testData/highlighting/referenceAttributes.fxml b/plugins/javaFX/testData/highlighting/referenceAttributes.fxml
new file mode 100644
index 000000000000..e1f5e19afc2e
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/referenceAttributes.fxml
@@ -0,0 +1,5 @@
+<?import javafx.scene.layout.GridPane?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <<error descr="Element fx:reference doesn't have required attribute source">fx:reference</error> GridPane.halignment="CENTER" />
+  <fx:reference GridPane.halignment="CENTER" source="<error descr="Cannot resolve symbol 'lbl'">lbl</error>"/>
+</GridPane>
diff --git a/plugins/javaFX/testData/highlighting/rootTag.fxml b/plugins/javaFX/testData/highlighting/rootTag.fxml
new file mode 100644
index 000000000000..6fa1c4ac7c85
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/rootTag.fxml
@@ -0,0 +1,7 @@
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.Label?>
+
+<fx:root type="javafx.scene.layout.VBox" xmlns:fx="http://javafx.com/fxml">
+  <TextField fx:id="textField" text=""/>
+  <Label text="Hello"/>
+</fx:root>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/rootTagWithoutType.fxml b/plugins/javaFX/testData/highlighting/rootTagWithoutType.fxml
new file mode 100644
index 000000000000..c7fd34ee6fe6
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/rootTagWithoutType.fxml
@@ -0,0 +1,7 @@
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.Label?>
+
+<<error descr="Element fx:root doesn't have required attribute type">fx:root</error> xmlns:fx="http://javafx.com/fxml">
+  <TextField fx:id="textField" text=""/>
+  <Label text="Hello"/>
+</<error descr="Element fx:root doesn't have required attribute type">fx:root</error>>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/s1.js b/plugins/javaFX/testData/highlighting/s1.js
new file mode 100644
index 000000000000..3e7874988622
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/s1.js
@@ -0,0 +1,4 @@
+importClass(java.lang.System);
+function handleButtonAction(event) {
+    System.out.println('You clicked me!');
+}
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/scriptSource.fxml b/plugins/javaFX/testData/highlighting/scriptSource.fxml
new file mode 100644
index 000000000000..b41e69ed332e
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/scriptSource.fxml
@@ -0,0 +1,5 @@
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.image.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <fx:script source="s1.js"/>
+</GridPane>
diff --git a/plugins/javaFX/testData/highlighting/sourceAttrRecognition.fxml b/plugins/javaFX/testData/highlighting/sourceAttrRecognition.fxml
new file mode 100644
index 000000000000..b17af0779ad1
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/sourceAttrRecognition.fxml
@@ -0,0 +1,10 @@
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.image.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <ImageView>
+    <image>
+      <fx:reference source="<error descr="Cannot resolve symbol 'myImage'">myImage</error>"/>
+    </image>
+  </ImageView>
+  <fx:include source="<error descr="Cannot resolve file 'my_button.fxml'">my_button.fxml</error>"/>
+</GridPane>
diff --git a/plugins/javaFX/testData/highlighting/staticProperties.fxml b/plugins/javaFX/testData/highlighting/staticProperties.fxml
new file mode 100644
index 000000000000..047c4a5677b8
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/staticProperties.fxml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+
+<AnchorPane xmlns:fx="http://javafx.com/fxml">
+    <children>
+        <AnchorPane AnchorPane.leftAnchor="0.0" <error descr="Attribute AnchorPane.leftAnchor1 is not allowed here">AnchorPane.leftAnchor1</error>="0.0">
+           <AnchorPane.bottomAnchor>200</AnchorPane.bottomAnchor>
+           <<error descr="Element AnchorPane1.bottomAnchor is not allowed here">AnchorPane1.bottomAnchor</error>>200</<error descr="Element AnchorPane1.bottomAnchor is not allowed here">AnchorPane1.bottomAnchor</error>>
+           <GridPane.rowIndex>0</GridPane.rowIndex>
+        </AnchorPane>
+    </children>
+</AnchorPane>
diff --git a/plugins/javaFX/testData/highlighting/unresolvedImport.fxml b/plugins/javaFX/testData/highlighting/unresolvedImport.fxml
new file mode 100644
index 000000000000..ffe1b1c141ec
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/unresolvedImport.fxml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.<error descr="Cannot resolve class 'GridPane1'">GridPane1</error>?>
+<?import javafx.scene.layout.GridPane?>
+<GridPane fx:id="gp"
+          xmlns:fx="http://javafx.com/fxml" alignment="center" hgap="10" vgap="10">
+</GridPane>
diff --git a/plugins/javaFX/testData/highlighting/unresolvedRootTag.fxml b/plugins/javaFX/testData/highlighting/unresolvedRootTag.fxml
new file mode 100644
index 000000000000..650af2aafe84
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/unresolvedRootTag.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.Label?>
+
+<fx:root type="<error descr="Cannot resolve class or package 'unknownPackage'">unknownPackage</error>.<error descr="Cannot resolve class 'unknownClass'">unknownClass</error>" xmlns:fx="http://javafx.com/fxml">
+  <TextField fx:id="textField" text=""/>
+  <Label text="Hello"/>
+</fx:root>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/valueOfAcceptance.fxml b/plugins/javaFX/testData/highlighting/valueOfAcceptance.fxml
new file mode 100644
index 000000000000..645e1b733f27
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/valueOfAcceptance.fxml
@@ -0,0 +1,18 @@
+<?import javafx.scene.layout.GridPane?>
+<?import java.lang.String?>
+<?import javafx.collections.FXCollections?>
+<?import java.util.ArrayList?>
+<?import java.lang.Double?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <fx:define>
+    <FXCollections fx:factory="observableArrayList">
+      <ArrayList fx:value=<error descr="Unable to coerce 'A' to java.util.ArrayList.">"A"</error>/>
+    </FXCollections>
+
+    <FXCollections fx:factory="observableArrayList">
+      <String fx:value="A"/>
+      <Double value="5"/>
+    </FXCollections>
+
+  </fx:define>
+</GridPane>
diff --git a/plugins/javaFX/testData/highlighting/variables.fxml b/plugins/javaFX/testData/highlighting/variables.fxml
new file mode 100644
index 000000000000..0b87abb81123
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/variables.fxml
@@ -0,0 +1,10 @@
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Tooltip?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <fx:define>
+    <Tooltip text="tooltip" fx:id="mytt"/>
+  </fx:define>
+
+  <Button text="Hello" fx:id="b1" tooltip="$mytt" />
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/importing/simpleImport.fxml b/plugins/javaFX/testData/importing/simpleImport.fxml
new file mode 100644
index 000000000000..394432faf90c
--- /dev/null
+++ b/plugins/javaFX/testData/importing/simpleImport.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <children>
+    <But<caret>ton/>
+  </children>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/importing/simpleImport_after.fxml b/plugins/javaFX/testData/importing/simpleImport_after.fxml
new file mode 100644
index 000000000000..9c070608a8f3
--- /dev/null
+++ b/plugins/javaFX/testData/importing/simpleImport_after.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.Button?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+  <children>
+    <Button/>
+  </children>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/inspections/defaultTag/children.fxml b/plugins/javaFX/testData/inspections/defaultTag/children.fxml
new file mode 100644
index 000000000000..61a9dcff8138
--- /dev/null
+++ b/plugins/javaFX/testData/inspections/defaultTag/children.fxml
@@ -0,0 +1,7 @@
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.TextField?>
+<GridPane>
+  <caret><children>
+    <TextField/>
+  </children>
+</GridPane>
diff --git a/plugins/javaFX/testData/inspections/defaultTag/children_after.fxml b/plugins/javaFX/testData/inspections/defaultTag/children_after.fxml
new file mode 100644
index 000000000000..85b769de6c81
--- /dev/null
+++ b/plugins/javaFX/testData/inspections/defaultTag/children_after.fxml
@@ -0,0 +1,5 @@
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.TextField?>
+<GridPane>
+    <TextField/>
+</GridPane>
diff --git a/plugins/javaFX/testData/inspections/defaultTag/emptyChildren.fxml b/plugins/javaFX/testData/inspections/defaultTag/emptyChildren.fxml
new file mode 100644
index 000000000000..e0cdc4e9e8f5
--- /dev/null
+++ b/plugins/javaFX/testData/inspections/defaultTag/emptyChildren.fxml
@@ -0,0 +1,6 @@
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.TextField?>
+<GridPane>
+  <caret><children>
+  </children>
+</GridPane>
diff --git a/plugins/javaFX/testData/inspections/defaultTag/emptyChildren_after.fxml b/plugins/javaFX/testData/inspections/defaultTag/emptyChildren_after.fxml
new file mode 100644
index 000000000000..b804f1862817
--- /dev/null
+++ b/plugins/javaFX/testData/inspections/defaultTag/emptyChildren_after.fxml
@@ -0,0 +1,4 @@
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.TextField?>
+<GridPane>
+</GridPane>
diff --git a/plugins/javaFX/testData/inspections/defaultTag/stylesheets.fxml b/plugins/javaFX/testData/inspections/defaultTag/stylesheets.fxml
new file mode 100644
index 000000000000..07d5119d9fc5
--- /dev/null
+++ b/plugins/javaFX/testData/inspections/defaultTag/stylesheets.fxml
@@ -0,0 +1,7 @@
+<?import javafx.scene.layout.AnchorPane?>
+<?import java.lang.String?>
+<AnchorPane id="AnchorPane" xmlns:fx="http://javafx.com/fxml">
+  <caret><stylesheets>
+    <String fx:value="mystyle.css"/>
+  </stylesheets>
+</AnchorPane>
diff --git a/plugins/javaFX/testData/jfxrt.jar b/plugins/javaFX/testData/jfxrt.jar
new file mode 100644
index 000000000000..48109d611026
--- /dev/null
+++ b/plugins/javaFX/testData/jfxrt.jar
diff --git a/plugins/javaFX/testData/quickfix/CreateControllerMethod.java b/plugins/javaFX/testData/quickfix/CreateControllerMethod.java
new file mode 100644
index 000000000000..e72dc651892b
--- /dev/null
+++ b/plugins/javaFX/testData/quickfix/CreateControllerMethod.java
@@ -0,0 +1 @@
+public class CreateControllerMethod {}
\ No newline at end of file
diff --git a/plugins/javaFX/testData/quickfix/CreateControllerMethod_after.java b/plugins/javaFX/testData/quickfix/CreateControllerMethod_after.java
new file mode 100644
index 000000000000..cdf4f4d6d1a5
--- /dev/null
+++ b/plugins/javaFX/testData/quickfix/CreateControllerMethod_after.java
@@ -0,0 +1,7 @@
+import javafx.event.ActionEvent;
+
+public class CreateControllerMethod {
+    public void bar(ActionEvent actionEvent) {
+        //To change body of created methods use File | Settings | File Templates.
+    }
+}
\ No newline at end of file
diff --git a/plugins/javaFX/testData/quickfix/createControllerMethod.fxml b/plugins/javaFX/testData/quickfix/createControllerMethod.fxml
new file mode 100644
index 000000000000..dbe1dc74e6e8
--- /dev/null
+++ b/plugins/javaFX/testData/quickfix/createControllerMethod.fxml
@@ -0,0 +1,5 @@
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.Button?>
+<GridPane xmlns:fx="http://javafx.com/fxml" fx:controller="CreateControllerMethod">
+  <Button onAction="#b<caret>ar"/>
+</GridPane>
diff --git a/plugins/javaFX/testData/rename/CustomComponent.java b/plugins/javaFX/testData/rename/CustomComponent.java
new file mode 100644
index 000000000000..a3339d4cc4f3
--- /dev/null
+++ b/plugins/javaFX/testData/rename/CustomComponent.java
@@ -0,0 +1,2 @@
+import javafx.scene.control.*;
+class CustomComponent extends Button {}
\ No newline at end of file
diff --git a/plugins/javaFX/testData/rename/customComponent.fxml b/plugins/javaFX/testData/rename/customComponent.fxml
new file mode 100644
index 000000000000..166cbef05c9a
--- /dev/null
+++ b/plugins/javaFX/testData/rename/customComponent.fxml
@@ -0,0 +1,4 @@
+<?import javafx.scene.layout.GridPane?>
+<?import Custom<caret>Component?>
+<GridPane>
+</GridPane>
diff --git a/plugins/javaFX/testData/rename/customComponent_after.fxml b/plugins/javaFX/testData/rename/customComponent_after.fxml
new file mode 100644
index 000000000000..c2e537cf7f5c
--- /dev/null
+++ b/plugins/javaFX/testData/rename/customComponent_after.fxml
@@ -0,0 +1,4 @@
+<?import javafx.scene.layout.GridPane?>
+<?import CustomComponent1?>
+<GridPane>
+</GridPane>