MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-18 12:31:26 +07:00
Code Issues Packages Projects Releases Wiki Activity

DevKit: fix marking field as class in ExtensionDomExtender

Browse Source
This commit is contained in:
Yaroslav Pankratyev
2018-08-15 16:41:17 +07:00
parent 4aaaf287cf
commit b301f92a7d
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/devkit/devkit-core/src/dom/impl/ExtensionDomExtender.java
View File

@@ -154,7 +154,7 @@ public class ExtensionDomExtender extends DomExtender<Extensions> {
final String attrName = getStringAttribute(attrAnno, "value", evalHelper);
if (attrName != null) {
Class clazz = String.class;
if (withElement != null || isClassField(fieldName)) {
if (withElement != null && isClassField(fieldName)) {
clazz = PsiClass.class;
} else if (PsiType.BOOLEAN.equals(field.getType())) {
clazz = Boolean.class;
@@ -201,16 +201,17 @@ public class ExtensionDomExtender extends DomExtender<Extensions> {
}
private static void markAsClass(DomExtension extension, String fieldName, @Nullable With withElement) {
if (withElement != null) {
final String withClassName = withElement.getImplements().getStringValue();
extension.addCustomAnnotation(new ExtendClassImpl() {
@Override
public String value() {
return withClassName;
}
});
}
if (withElement != null || isClassField(fieldName)) {
if (withElement == null) return;
final String withClassName = withElement.getImplements().getStringValue();
extension.addCustomAnnotation(new ExtendClassImpl() {
@Override
public String value() {
return withClassName;
}
});
if (isClassField(fieldName)) {
extension.setConverter(CLASS_CONVERTER);
}
}