MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Javafx: Don't highlight absolute (remote) URL as invalid in FXML. Test added (IDEA-154132)

Browse Source
This commit is contained in:
Pavel Dolgov
2016-04-07 19:15:45 +03:00
parent 3828544e53
commit b7fe0c4c96
4 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
+4
View File
@@ -428,6 +428,10 @@ public class JavaFXHighlightingTest extends AbstractJavaFXTestCase {
myFixture.testHighlighting(true, false, false, getTestName(false) + ".java");
}
public void testAbsoluteRemoteUrl() throws Exception {
doTest();
}
private void doTest() throws Exception {
myFixture.testHighlighting(false, false, false, getTestName(true) + ".fxml");
}
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlConstants.java
+1
View File
@@ -45,6 +45,7 @@ public class FxmlConstants {
@NonNls public static final String STYLE_CLASS = "styleClass";
@NonNls public static final String STYLESHEETS = "stylesheets";
@NonNls public static final String URL = "url";
@NonNls public static final String SOURCE = "source";
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/FxmlReferencesContributor.java
+4 -2
View File
@@ -99,8 +99,10 @@ public class FxmlReferencesContributor extends PsiReferenceContributor {
.and(attributeValueInFxml),
new JavaFxComponentIdReferenceProvider());
registrar.registerReferenceProvider(XmlPatterns.xmlAttributeValue().withParent(XmlPatterns.xmlAttribute().withName("url")).and(attributeValueInFxml),
new JavaFxLocationReferenceProvider(false, "png"));
registrar.registerReferenceProvider(XmlPatterns.xmlAttributeValue().withParent(XmlPatterns.xmlAttribute().withName(FxmlConstants.URL))
.andNot(XmlPatterns.xmlAttributeValue().withValue(string().matches("^http(s)?://.*")))
.and(attributeValueInFxml),
new JavaFxLocationReferenceProvider(false, "png", "jpg", "gif", "bmp"));
registrar.registerReferenceProvider(XmlPatterns.xmlAttributeValue().withParent(XmlPatterns.xmlAttribute().withName(FxmlConstants.STYLESHEETS)).and(attributeValueInFxml),
new JavaFxLocationReferenceProvider(true, "css"));
plugins/javaFX/testData/highlighting/absoluteRemoteUrl.fxml
+18
View File
@@ -0,0 +1,18 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.image.Image?>
<VBox>
<ImageView>
<Image url="https://upload.wikimedia.org/wikipedia/commons/b/b5/Kotlin-logo.png" />
</ImageView>
<ImageView>
<image>
<Image url="http://thedeliciousrevolution.com/wp-content/uploads/2008/08/Pears.png"/>
</image>
</ImageView>
<ImageView>
<image>
<Image url="https://upload.wikimedia.org/wikipedia/commons/a/aa/SmallFullColourGIF.gif "/>
</image>
</ImageView>
</VBox>