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: do not complete primitive subtags

Browse Source 
(cherry picked from commit 9241edb)
This commit is contained in:
anna
2013-03-22 21:37:19 +01:00
parent f9a4b7ee47
commit abf81d604e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassBackedElementDescriptor.java
+4 -4
View File
@@ -67,7 +67,7 @@ public class JavaFxClassBackedElementDescriptor implements XmlElementDescriptor,
public XmlElementDescriptor fun(PsiField field) {
return new JavaFxPropertyElementDescriptor(myPsiClass, field.getName(), false);
}
});
}, false);
final JavaFxPropertyElementDescriptor defaultPropertyDescriptor = getDefaultPropertyDescriptor();
if (defaultPropertyDescriptor != null) {
@@ -209,7 +209,7 @@ public class JavaFxClassBackedElementDescriptor implements XmlElementDescriptor,
public XmlAttributeDescriptor fun(PsiField field) {
return new JavaFxPropertyAttributeDescriptor(field.getName(), myPsiClass);
}
});
}, true);
collectStaticAttributesDescriptors(context, simpleAttrs);
for (String defaultProperty : FxmlConstants.FX_DEFAULT_PROPERTIES) {
simpleAttrs.add(new JavaFxDefaultAttributeDescriptor(defaultProperty, myPsiClass));
@@ -220,7 +220,7 @@ public class JavaFxClassBackedElementDescriptor implements XmlElementDescriptor,
return XmlAttributeDescriptor.EMPTY;
}
private <T> void collectProperties(List<T> children, Function<PsiField, T> factory) {
private <T> void collectProperties(List<T> children, Function<PsiField, T> factory, boolean acceptPrimitive) {
final PsiField[] fields = myPsiClass.getAllFields();
if (fields.length > 0) {
for (PsiField field : fields) {
@@ -229,7 +229,7 @@ public class JavaFxClassBackedElementDescriptor implements XmlElementDescriptor,
if (!JavaFxPsiUtil.isReadOnly(myPsiClass, field) &&
InheritanceUtil.isInheritor(fieldType, JavaFxCommonClassNames.JAVAFX_BEANS_PROPERTY) ||
fieldType.equalsToText(CommonClassNames.JAVA_LANG_STRING) ||
fieldType instanceof PsiPrimitiveType ||
(acceptPrimitive && fieldType instanceof PsiPrimitiveType) ||
GenericsHighlightUtil.getCollectionItemType(field.getType(), myPsiClass.getResolveScope()) != null) {
children.add(factory.fun(field));
}
plugins/javaFX/testData/completion/primitiveSubtags.fxml
+4
View File
@@ -0,0 +1,4 @@
<?import javafx.scene.image.*?>
<ImageView id="lock" pickOnBounds="true">
<<caret>
</ImageView>