From 085ee00c92220fdf938167b8f25fe28886f19970 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Wed, 4 Apr 2012 14:11:20 +0200
Subject: [PATCH 1/2] correct test data

---
 .../testData/fileStructure/selection/AnonymousInAnonymous.tree  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/java-tests/testData/fileStructure/selection/AnonymousInAnonymous.tree b/java/java-tests/testData/fileStructure/selection/AnonymousInAnonymous.tree
index 1f8848854d70..2779dff18fad 100644
--- a/java/java-tests/testData/fileStructure/selection/AnonymousInAnonymous.tree
+++ b/java/java-tests/testData/fileStructure/selection/AnonymousInAnonymous.tree
@@ -4,7 +4,7 @@
   -foo():void
    -$1
     -toString():String
-     -Anonymous
+     -$1
       [method():void]
   num1:int
   num2:int
\ No newline at end of file

From 3e94ec172321f6060ad512e775665c7db3b1e28f Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Wed, 4 Apr 2012 16:16:19 +0400
Subject: [PATCH 2/2] NPE fixed

---
 .../devkit/src/dom/impl/ExtensionDomExtender.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/devkit/src/dom/impl/ExtensionDomExtender.java b/plugins/devkit/src/dom/impl/ExtensionDomExtender.java
index 922861de9c70..13e25dc51ab2 100644
--- a/plugins/devkit/src/dom/impl/ExtensionDomExtender.java
+++ b/plugins/devkit/src/dom/impl/ExtensionDomExtender.java
@@ -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;
+          }
         }
       }
     }