From 5215aaff6d341bf2cfb78c3790b0db7d2851d459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Thu, 15 Aug 2019 16:47:16 +0200 Subject: [PATCH] [devkit] ExtensionDomExtender: cleanup GitOrigin-RevId: d1d1a8451f96a86f2cdfdd9d912b151b538f64e8 --- .../src/dom/impl/ExtensionDomExtender.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/plugins/devkit/devkit-core/src/dom/impl/ExtensionDomExtender.java b/plugins/devkit/devkit-core/src/dom/impl/ExtensionDomExtender.java index 34910ad44d78..93eed6e0fbbf 100644 --- a/plugins/devkit/devkit-core/src/dom/impl/ExtensionDomExtender.java +++ b/plugins/devkit/devkit-core/src/dom/impl/ExtensionDomExtender.java @@ -87,7 +87,7 @@ public class ExtensionDomExtender extends DomExtender { } @Nullable - public static With findWithElement(List elements, PsiField field) { + static With findWithElement(List elements, PsiField field) { for (With element : elements) { if (Comparing.equal(field.getName(), element.getAttribute().getStringValue())) { return element; @@ -96,7 +96,7 @@ public class ExtensionDomExtender extends DomExtender { return null; } - private static void registerField(final DomExtensionsRegistrar registrar, @NotNull final PsiField field, With withElement) { + private static void registerField(final DomExtensionsRegistrar registrar, @NotNull final PsiField field, @Nullable With withElement) { final PsiMethod getter = PropertyUtilBase.findGetterForField(field); final PsiMethod setter = PropertyUtilBase.findSetterForField(field); if (!field.hasModifierProperty(PsiModifier.PUBLIC) && (getter == null || setter == null)) { @@ -188,15 +188,10 @@ public class ExtensionDomExtender extends DomExtender { @Nullable static PsiAnnotation findAnnotation(final Class annotationClass, PsiMember... members) { for (PsiMember member : members) { - if (member != null) { - final PsiModifierList modifierList = member.getModifierList(); - if (modifierList != null) { - final PsiAnnotation annotation = modifierList.findAnnotation(annotationClass.getName()); - if (annotation != null) { - return annotation; - } - } - } + if (member == null) continue; + + final PsiAnnotation annotation = member.getAnnotation(annotationClass.getName()); + if (annotation != null) return annotation; } return null; }