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: suggest for completion properties without underlying field

Browse Source
This commit is contained in:
anna
2013-04-15 20:59:56 +02:00
parent 0d66f07f7e
commit 7a5cc1091a
4 changed files with 43 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxCompletionTest.java
+7 -1
View File
@@ -165,11 +165,17 @@ public class JavaFxCompletionTest extends LightFixtureCompletionTestCase {
assertContainsElements(myFixture.getLookupElementStrings(), "true", "false");
}
public void testPropertyNameWithoutField() throws Exception {
myFixture.configureByFiles(getTestName(true) + ".fxml");
complete();
assertContainsElements(myFixture.getLookupElementStrings(), "disable");
}
public void testDefaultPropertyIncludeOnce() throws Exception {
myFixture.configureByFiles(getTestName(true) + ".fxml");
myItems = myFixture.completeBasic();
assertContainsElements(myFixture.getLookupElementStrings(), "fx:reference");
assertEquals(5, myItems.length);
assertEquals(3, myItems.length);
}
public void testAcceptableSourceOnly() throws Exception {
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxCommonClassNames.java
+1
View File
@@ -27,6 +27,7 @@ import java.util.Map;
*/
public class JavaFxCommonClassNames {
@NonNls public static final String JAVAFX_BEANS_PROPERTY = "javafx.beans.property.Property";
@NonNls public static final String JAVAFX_OBSERVABLE_LIST_PROPERTY = "javafx.collections.ObservableList";
@NonNls public static final String JAVAFX_ANCHOR_PANE = "javafx.scene.layout.AnchorPane";
@NonNls public static final String JAVAFX_EVENT = "javafx.event.Event";
@NonNls public static final String JAVAFX_BEANS_DEFAULT_PROPERTY = "javafx.beans.DefaultProperty";
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassBackedElementDescriptor.java
+33 -15
View File
@@ -61,10 +61,10 @@ public class JavaFxClassBackedElementDescriptor implements XmlElementDescriptor,
if (context != null) {
if (myPsiClass != null) {
final List<XmlElementDescriptor> children = new ArrayList<XmlElementDescriptor>();
collectProperties(children, new Function<PsiField, XmlElementDescriptor>() {
collectProperties(children, new Function<PsiMember, XmlElementDescriptor>() {
@Override
public XmlElementDescriptor fun(PsiField field) {
return new JavaFxPropertyElementDescriptor(myPsiClass, field.getName(), false);
public XmlElementDescriptor fun(PsiMember member) {
return new JavaFxPropertyElementDescriptor(myPsiClass, member instanceof PsiMethod ? PropertyUtil.getPropertyName(member) : member.getName(), false);
}
}, false);
@@ -232,21 +232,21 @@ public class JavaFxClassBackedElementDescriptor implements XmlElementDescriptor,
}
protected void collectInstanceProperties(List<XmlAttributeDescriptor> simpleAttrs) {
collectProperties(simpleAttrs, new Function<PsiField, XmlAttributeDescriptor>() {
collectProperties(simpleAttrs, new Function<PsiMember, XmlAttributeDescriptor>() {
@Override
public XmlAttributeDescriptor fun(PsiField field) {
return new JavaFxPropertyAttributeDescriptor(field.getName(), myPsiClass);
public XmlAttributeDescriptor fun(PsiMember member) {
return new JavaFxPropertyAttributeDescriptor(member instanceof PsiMethod ? PropertyUtil.getPropertyName(member) : member.getName(), myPsiClass);
}
}, true);
}
private <T> void collectProperties(final List<T> children, final Function<PsiField, T> factory, final boolean acceptPrimitive) {
final List<PsiField> fieldList =
CachedValuesManager.getManager(myPsiClass.getProject()).getCachedValue(myPsiClass, new CachedValueProvider<List<PsiField>>() {
private <T> void collectProperties(final List<T> children, final Function<PsiMember, T> factory, final boolean acceptPrimitive) {
final List<PsiMember> fieldList =
CachedValuesManager.getManager(myPsiClass.getProject()).getCachedValue(myPsiClass, new CachedValueProvider<List<PsiMember>>() {
@Nullable
@Override
public Result<List<PsiField>> compute() {
List<PsiField> acceptableFields = new ArrayList<PsiField>();
public Result<List<PsiMember>> compute() {
List<PsiMember> acceptableFields = new ArrayList<PsiMember>();
final PsiField[] fields = myPsiClass.getAllFields();
if (fields.length > 0) {
for (PsiField field : fields) {
@@ -254,18 +254,36 @@ public class JavaFxClassBackedElementDescriptor implements XmlElementDescriptor,
final PsiType fieldType = field.getType();
if (!JavaFxPsiUtil.isReadOnly(myPsiClass, field) &&
InheritanceUtil.isInheritor(fieldType, JavaFxCommonClassNames.JAVAFX_BEANS_PROPERTY) ||
fieldType.equalsToText(CommonClassNames.JAVA_LANG_STRING) ||
(acceptPrimitive && fieldType instanceof PsiPrimitiveType) ||
GenericsHighlightUtil.getCollectionItemType(field.getType(), myPsiClass.getResolveScope()) != null) {
acceptablePropertyType(fieldType)) {
acceptableFields.add(field);
}
}
}
for (PsiMethod method : myPsiClass.getAllMethods()) {
if (PropertyUtil.isSimplePropertySetter(method) && !method.hasModifierProperty(PsiModifier.STATIC)) {
final String propertyName = PropertyUtil.getPropertyName(method);
assert propertyName != null;
final PsiParameter[] parameters = method.getParameterList().getParameters();
if (parameters.length != 1) continue;
if (myPsiClass.findFieldByName(propertyName, true) != null) continue;
final PsiType propertyType = parameters[0].getType();
final String suggestedGetterName = PropertyUtil.suggestGetterName(propertyName, propertyType);
if (myPsiClass.findMethodsByName(suggestedGetterName, true).length == 0) continue;
if (!acceptablePropertyType(propertyType)) continue;
acceptableFields.add(method);
}
}
return Result.create(acceptableFields, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
}
private boolean acceptablePropertyType(PsiType fieldType) {
return fieldType.equalsToText(CommonClassNames.JAVA_LANG_STRING) ||
(acceptPrimitive && fieldType instanceof PsiPrimitiveType) ||
InheritanceUtil.isInheritor(fieldType, JavaFxCommonClassNames.JAVAFX_OBSERVABLE_LIST_PROPERTY) && GenericsHighlightUtil.getCollectionItemType(fieldType, myPsiClass.getResolveScope()) != null;
}
});
if (fieldList != null) {
for (PsiField field : fieldList) {
for (PsiMember field : fieldList) {
children.add(factory.fun(field));
}
}
plugins/javaFX/testData/completion/propertyNameWithoutField.fxml
+2
View File
@@ -0,0 +1,2 @@
<?import javafx.scene.layout.GridPane?>
<GridPane xmlns:fx="http://javafx.com/fxml" d<caret>/>