From 9641c94bd1c730be38df7246d9411a2c80c7f6c3 Mon Sep 17 00:00:00 2001 From: anna Date: Fri, 29 Mar 2013 14:54:54 +0100 Subject: [PATCH] javafx: mark refs unresolved if controller is present and fx:root is specified (cherry picked from commit 43b169bb54513d76e48078972fbf75eff4e102d8) --- .../javaFX/fxml/refs/JavaFxFieldIdReferenceProvider.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxFieldIdReferenceProvider.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxFieldIdReferenceProvider.java index 5cb374f494fc..a6d9ccda005c 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxFieldIdReferenceProvider.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxFieldIdReferenceProvider.java @@ -23,7 +23,6 @@ import com.intellij.util.ArrayUtil; import com.intellij.util.ProcessingContext; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.plugins.javaFX.fxml.FxmlConstants; import org.jetbrains.plugins.javaFX.fxml.JavaFxPsiUtil; import java.util.ArrayList; @@ -73,7 +72,7 @@ public class JavaFxFieldIdReferenceProvider extends JavaFxControllerBasedReferen final XmlFile xmlFile = (XmlFile)myXmlAttributeValue.getContainingFile(); final XmlTag rootTag = xmlFile.getRootTag(); if (rootTag != null) { - if (!JavaFxPsiUtil.isOutOfHierarchy(myXmlAttributeValue) && !FxmlConstants.FX_ROOT.equals(rootTag.getName())) { + if (!JavaFxPsiUtil.isOutOfHierarchy(myXmlAttributeValue)) { return null; } }