javafx: mark refs unresolved if controller is present and fx:root is specified

(cherry picked from commit 43b169bb54513d76e48078972fbf75eff4e102d8)
This commit is contained in:
anna
2013-03-29 20:10:02 +01:00
parent 8ae27db099
commit 9641c94bd1
@@ -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;
}
}