good code red: nested classes inheritance

java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java

@@ -1258,7 +1258,9 @@ public class GenericsHighlightUtil {
           final PsiElement superClass = referenceElement.resolve();
           if (superClass instanceof PsiClass) {
             final PsiClass superContainingClass = ((PsiClass)superClass).getContainingClass();
-            if (superContainingClass != null && InheritanceUtil.isInheritorOrSelf(containingClass, superContainingClass, true)) {
+            if (superContainingClass != null && 
+                InheritanceUtil.isInheritorOrSelf(containingClass, superContainingClass, true) && 
+                !PsiTreeUtil.isAncestor(superContainingClass, containingClass, true)) {
               return true;
             }
           }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA55510.java

@@ -19,4 +19,18 @@ class AbstractSettings {
 interface SomeInterface<T> {}
 class Settings extends AbstractSettings implements SomeInterface<Settings.MyState> {
     static class MyState implements State {}
-}
+}
+
+//--------------------------------------------
+class Records {
+  interface RecordCategory {
+  }
+
+  static abstract class Record<CATEGORY_TYPE extends RecordCategory> extends Records {}
+
+  static class ResultRecord extends Record<ResultRecord.Category> {
+    public enum Category implements RecordCategory {
+      kind();
+    }
+  }
+}