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 f2d8fd0487f2..2b57e22e7295 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 @@ -65,6 +65,10 @@ public class JavaFXHighlightingTest extends LightCodeInsightFixtureTestCase { doTest(); } + public void testRootTagCoercedUnchecked() throws Exception { + doTest(); + } + public void testStaticProperties() throws Exception { doTest(); } 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 b8d119251c44..3231be970f90 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java @@ -436,13 +436,10 @@ public class JavaFxPsiUtil { } public static String isClassAcceptable(@Nullable XmlTag parentTag, final PsiClass aClass) { + if (parentTag == null) { + return null; + } if (aClass != null && aClass.isValid()) { - if (parentTag == null) { - if (!InheritanceUtil.isInheritor(aClass, false, JavaFxCommonClassNames.JAVAFX_SCENE_NODE)) { - return unableToCoerceMessage(aClass, JavaFxCommonClassNames.JAVAFX_SCENE_NODE); - } - return null; - } final XmlElementDescriptor descriptor = parentTag.getDescriptor(); if (descriptor instanceof JavaFxPropertyElementDescriptor) { final PsiElement declaration = descriptor.getDeclaration(); diff --git a/plugins/javaFX/testData/highlighting/rootTagCoercedUnchecked.fxml b/plugins/javaFX/testData/highlighting/rootTagCoercedUnchecked.fxml new file mode 100644 index 000000000000..03a9f9383a7b --- /dev/null +++ b/plugins/javaFX/testData/highlighting/rootTagCoercedUnchecked.fxml @@ -0,0 +1,3 @@ + + +