SOE (IDEA-109955)

java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateCreateUIAction.java

@@ -17,6 +17,7 @@ package com.intellij.codeInsight.generation.actions;
 
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTypesUtil;
+import com.intellij.util.containers.HashSet;
 
 /**
  * @author Konstantin Bulenkov
@@ -27,12 +28,12 @@ public class GenerateCreateUIAction extends BaseGenerateAction {
   }
 
   @Override
-  protected boolean isValidForClass(PsiClass targetClass) {
+  public boolean isValidForClass(PsiClass targetClass) {
     final PsiModifierList list = targetClass.getModifierList();
     return list != null
            && !list.hasModifierProperty(PsiModifier.ABSTRACT)
            && !hasCreateUIMethod(targetClass)
-           && isComponentUI(targetClass);
+           && isComponentUI(targetClass, new HashSet<PsiClass>());
   }
 
   private static boolean hasCreateUIMethod(PsiClass aClass) {
@@ -49,8 +50,9 @@ public class GenerateCreateUIAction extends BaseGenerateAction {
     return false;
   }
 
-  private static boolean isComponentUI(PsiClass aClass) {
+  private static boolean isComponentUI(PsiClass aClass, HashSet<PsiClass> classes) {
     while (aClass != null) {
+      if (!classes.add(aClass)) return false;
       if ("javax.swing.plaf.ComponentUI".equals(aClass.getQualifiedName())) {
         return true;
       }

java/java-tests/testData/codeInsight/generate/generateCreateUI/beforeSOE.java

@@ -0,0 +1,3 @@
+class A extends A {
+  <caret>
+}

java/java-tests/testSrc/com/intellij/codeInsight/GenerateCreateUITest.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInsight;
+
+import com.intellij.codeInsight.generation.actions.GenerateCreateUIAction;
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.testFramework.LightCodeInsightTestCase;
+
+/**
+ * @author anna
+ */
+public class GenerateCreateUITest extends LightCodeInsightTestCase {
+  public void testSOE() throws Exception { 
+    configureByFile("/codeInsight/generate/generateCreateUI/beforeSOE.java");
+    final PsiClass targetClass = PsiTreeUtil.getParentOfType(getFile().findElementAt(getEditor().getCaretModel().getOffset()), PsiClass.class);
+    assertNotNull(targetClass);
+    assertFalse(new GenerateCreateUIAction().isValidForClass(targetClass));
+  }
+  
+}