Merge remote-tracking branch 'origin/master'

This commit is contained in:
Maxim.Medvedev
2012-04-04 16:20:44 +04:00
2 changed files with 8 additions and 6 deletions
@@ -4,7 +4,7 @@
-foo():void
-$1
-toString():String
-Anonymous
-$1
[method():void]
num1:int
num2:int
@@ -184,11 +184,13 @@ public class ExtensionDomExtender extends DomExtender<Extensions> {
@Nullable
private static PsiAnnotation findAnnotation(final Class<?> annotationClass, PsiMember... members) {
for (PsiMember member : members) {
final PsiModifierList modifierList = member.getModifierList();
if (modifierList != null) {
final PsiAnnotation annotation = modifierList.findAnnotation(annotationClass.getName());
if (annotation != null) {
return annotation;
if (member != null) {
final PsiModifierList modifierList = member.getModifierList();
if (modifierList != null) {
final PsiAnnotation annotation = modifierList.findAnnotation(annotationClass.getName());
if (annotation != null) {
return annotation;
}
}
}
}