From eeded09c18d2ea72019b7f756445fec1cf5d9c79 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Wed, 17 Jun 2015 20:10:21 +0300 Subject: [PATCH] javafx: unable to coerce check does not make sense for pane's node elements --- .../javaFX/fxml/AbstractJavaFXTestCase.java | 6 ------ .../JavaFXCollapseSubtagToAttributeTest.java | 3 ++- .../fxml/JavaFXDaemonAnalyzerTestCase.java | 16 ---------------- .../javaFX/fxml/JavaFXExpandAttributeTest.java | 3 ++- .../plugins/javaFX/fxml/JavaFXImportTest.java | 3 ++- .../plugins/javaFX/fxml/JavaFXQuickfixTest.java | 8 +------- .../plugins/javaFX/fxml/JavaFXRenameTest.java | 3 ++- .../JavaFxPropertyAttributeDescriptor.java | 7 ++++++- 8 files changed, 15 insertions(+), 34 deletions(-) delete mode 100644 plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXDaemonAnalyzerTestCase.java diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java index 5d6528bfdfd9..4ef5709f8620 100644 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java +++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java @@ -53,10 +53,4 @@ public abstract class AbstractJavaFXTestCase extends LightCodeInsightFixtureTest super.setUp(); enableInspections(); } - - @Override - protected void runTest() throws Throwable { - Assume.assumeFalse(SystemInfo.isMac); - super.runTest(); - } } diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXCollapseSubtagToAttributeTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXCollapseSubtagToAttributeTest.java index 4b7b9592fe9b..9839bef63707 100644 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXCollapseSubtagToAttributeTest.java +++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXCollapseSubtagToAttributeTest.java @@ -15,6 +15,7 @@ */ package org.jetbrains.plugins.javaFX.fxml; +import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.intention.impl.ShowIntentionActionsHandler; @@ -26,7 +27,7 @@ import org.jetbrains.annotations.NotNull; import java.util.List; -public class JavaFXCollapseSubtagToAttributeTest extends JavaFXDaemonAnalyzerTestCase { +public class JavaFXCollapseSubtagToAttributeTest extends DaemonAnalyzerTestCase { @Override protected void setUpModule() { super.setUpModule(); diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXDaemonAnalyzerTestCase.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXDaemonAnalyzerTestCase.java deleted file mode 100644 index b7f7851b6a88..000000000000 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXDaemonAnalyzerTestCase.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.jetbrains.plugins.javaFX.fxml; - -import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase; -import com.intellij.openapi.util.SystemInfo; -import org.junit.Assume; - -/** - * @author nik - */ -public class JavaFXDaemonAnalyzerTestCase extends DaemonAnalyzerTestCase { - @Override - protected void runTest() throws Throwable { - Assume.assumeFalse(SystemInfo.isMac); - super.runTest(); - } -} diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXExpandAttributeTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXExpandAttributeTest.java index e548f0f2482d..bcee2c97e692 100644 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXExpandAttributeTest.java +++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXExpandAttributeTest.java @@ -15,6 +15,7 @@ */ package org.jetbrains.plugins.javaFX.fxml; +import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.intention.impl.ShowIntentionActionsHandler; @@ -26,7 +27,7 @@ import org.jetbrains.annotations.NotNull; import java.util.List; -public class JavaFXExpandAttributeTest extends JavaFXDaemonAnalyzerTestCase { +public class JavaFXExpandAttributeTest extends DaemonAnalyzerTestCase { @Override protected void setUpModule() { super.setUpModule(); diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXImportTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXImportTest.java index 00d104707bcd..e8fea47215e8 100644 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXImportTest.java +++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXImportTest.java @@ -15,6 +15,7 @@ */ package org.jetbrains.plugins.javaFX.fxml; +import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.openapi.application.PluginPathManager; import com.intellij.testFramework.PsiTestUtil; @@ -22,7 +23,7 @@ import org.jetbrains.annotations.NotNull; import java.util.List; -public class JavaFXImportTest extends JavaFXDaemonAnalyzerTestCase { +public class JavaFXImportTest extends DaemonAnalyzerTestCase { @Override protected void setUpModule() { super.setUpModule(); diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java index da08ec3f6bcc..63ec6fe1d87e 100644 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java +++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java @@ -101,13 +101,7 @@ public class JavaFXQuickfixTest extends LightCodeInsightFixtureTestCase { super.setUp(); myFixture.enableInspections(new JavaFxUnresolvedFxIdReferenceInspection()); } - - @Override - protected void runTest() throws Throwable { - Assume.assumeFalse(SystemInfo.isMac); - super.runTest(); - } - + @NotNull @Override protected String getTestDataPath() { diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXRenameTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXRenameTest.java index 56f647133506..713bc42382e4 100644 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXRenameTest.java +++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXRenameTest.java @@ -16,6 +16,7 @@ package org.jetbrains.plugins.javaFX.fxml; import com.intellij.codeInsight.TargetElementUtil; +import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase; import com.intellij.openapi.application.PluginPathManager; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; @@ -25,7 +26,7 @@ import com.intellij.testFramework.PsiTestUtil; import com.intellij.testFramework.fixtures.CodeInsightTestUtil; import org.jetbrains.annotations.NotNull; -public class JavaFXRenameTest extends JavaFXDaemonAnalyzerTestCase { +public class JavaFXRenameTest extends DaemonAnalyzerTestCase { @Override protected void setUpModule() { super.setUpModule(); diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxPropertyAttributeDescriptor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxPropertyAttributeDescriptor.java index 65b66e8901e0..ab8511e08b2f 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxPropertyAttributeDescriptor.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxPropertyAttributeDescriptor.java @@ -158,7 +158,12 @@ public class JavaFxPropertyAttributeDescriptor extends BasicXmlAttributeDescript } else { final PsiClass tagClass = JavaFxPsiUtil.getTagClass((XmlAttributeValue)context); - boxedQName = tagClass != null ? tagClass.getQualifiedName() : null; + if (tagClass != null && !InheritanceUtil.isInheritor(tagClass, false, JavaFxCommonClassNames.JAVAFX_SCENE_NODE)) { + boxedQName = tagClass.getQualifiedName(); + } + else { + boxedQName = null; + } } if (boxedQName != null) { try {