From 09fdfb698677c1188997b0fcce409df05e1c60f5 Mon Sep 17 00:00:00 2001
From: Andrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Date: Tue, 17 Sep 2013 20:59:01 +0400
Subject: [PATCH] Removed redundant PyClass.getSuperClassElements() method

---
 .../python/psi/impl/PyJavaClassType.java      |  4 +++
 .../PyJavaSuperMethodsSearchExecutor.java     |  9 ++++---
 .../src/com/jetbrains/python/psi/PyClass.java |  8 ------
 .../PyOldStyleClassesInspection.java          | 18 ++++++++++---
 .../python/psi/impl/PyClassImpl.java          | 26 -------------------
 5 files changed, 23 insertions(+), 42 deletions(-)

diff --git a/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaClassType.java b/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaClassType.java
index 18a8a80c0ec2..5a6105b10b2d 100644
--- a/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaClassType.java
+++ b/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaClassType.java
@@ -132,4 +132,8 @@ public class PyJavaClassType implements PyClassLikeType {
   public boolean isValid() {
     return myClass.isValid();
   }
+
+  public PsiClass getPsiClass() {
+    return myClass;
+  }
 }
diff --git a/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaSuperMethodsSearchExecutor.java b/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaSuperMethodsSearchExecutor.java
index 5c99c28df78a..93f8cce3d72f 100644
--- a/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaSuperMethodsSearchExecutor.java
+++ b/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaSuperMethodsSearchExecutor.java
@@ -9,6 +9,8 @@ import com.intellij.util.containers.ContainerUtil;
 import com.jetbrains.python.psi.PyClass;
 import com.jetbrains.python.psi.PyFunction;
 import com.jetbrains.python.psi.search.PySuperMethodsSearch;
+import com.jetbrains.python.psi.types.PyClassLikeType;
+import com.jetbrains.python.psi.types.TypeEvalContext;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -19,10 +21,9 @@ public class PyJavaSuperMethodsSearchExecutor implements QueryExecutor<PsiElemen
     PyFunction func = queryParameters.getDerivedMethod();
     PyClass containingClass = func.getContainingClass();
     if (containingClass != null) {
-      PsiElement[] superClassElements = containingClass.getSuperClassElements();
-      for(PsiElement element: superClassElements) {
-        if (element instanceof PsiClass) {
-          PsiClass psiClass = (PsiClass) element;
+      for (PyClassLikeType type : containingClass.getSuperClassTypes(TypeEvalContext.codeInsightFallback())) {
+        if (type instanceof PyJavaClassType) {
+          final PsiClass psiClass = ((PyJavaClassType)type).getPsiClass();
           PsiMethod[] methods = psiClass.findMethodsByName(func.getName(), true);
           // the Python method actually does override/implement all of Java super methods with the same name
           if (!ContainerUtil.process(methods, consumer)) return false;
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyClass.java b/python/psi-api/src/com/jetbrains/python/psi/PyClass.java
index 1e69ee5b02f5..32529cfd3f86 100644
--- a/python/psi-api/src/com/jetbrains/python/psi/PyClass.java
+++ b/python/psi-api/src/com/jetbrains/python/psi/PyClass.java
@@ -95,14 +95,6 @@ public interface PyClass extends PsiNameIdentifierOwner, PyStatement, NameDefine
   @NotNull
   PyExpression[] getSuperClassExpressions();
 
-  /**
-   * Returns resolved elements representing super classes from the super classes list.
-   *
-   * Operates at the AST level.
-   */
-  @NotNull
-  PsiElement[] getSuperClassElements();
-
   @NotNull
   PyFunction[] getMethods();
 
diff --git a/python/src/com/jetbrains/python/inspections/PyOldStyleClassesInspection.java b/python/src/com/jetbrains/python/inspections/PyOldStyleClassesInspection.java
index 4e109dbcb525..44217b20a18d 100644
--- a/python/src/com/jetbrains/python/inspections/PyOldStyleClassesInspection.java
+++ b/python/src/com/jetbrains/python/inspections/PyOldStyleClassesInspection.java
@@ -2,11 +2,12 @@ package com.jetbrains.python.inspections;
 
 import com.intellij.codeInspection.LocalInspectionToolSession;
 import com.intellij.codeInspection.ProblemsHolder;
-import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.jetbrains.python.PyBundle;
 import com.jetbrains.python.psi.*;
+import com.jetbrains.python.psi.types.PyClassLikeType;
+import com.jetbrains.python.psi.types.TypeEvalContext;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -57,12 +58,21 @@ public class PyOldStyleClassesInspection extends PyInspection {
     public void visitPyCallExpression(final PyCallExpression node) {
       PyClass klass = PsiTreeUtil.getParentOfType(node, PyClass.class);
       if (klass != null && !klass.isNewStyleClass()) {
-        PyExpression[] superClassExprs = klass.getSuperClassExpressions();
-        PsiElement[] superClasses = klass.getSuperClassElements();
-        if (superClasses.length != superClassExprs.length) return;
+        if (hasUnknownAncestors(klass, myTypeEvalContext)) {
+          return;
+        }
         if (PyUtil.isSuperCall(node))
           registerProblem(node.getCallee(), "Old-style class contains call for super method");
       }
     }
   }
+
+  private static boolean hasUnknownAncestors(@NotNull PyClass cls, @NotNull TypeEvalContext context) {
+    for (PyClassLikeType type : cls.getAncestorTypes(context)) {
+      if (type == null) {
+        return true;
+      }
+    }
+    return false;
+  }
 }
diff --git a/python/src/com/jetbrains/python/psi/impl/PyClassImpl.java b/python/src/com/jetbrains/python/psi/impl/PyClassImpl.java
index 409d635bc024..a8e506f39301 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyClassImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyClassImpl.java
@@ -25,7 +25,6 @@ import com.jetbrains.python.codeInsight.controlflow.ScopeOwner;
 import com.jetbrains.python.codeInsight.dataflow.scope.ScopeUtil;
 import com.jetbrains.python.documentation.DocStringUtil;
 import com.jetbrains.python.psi.*;
-import com.jetbrains.python.psi.resolve.PyResolveContext;
 import com.jetbrains.python.psi.resolve.PyResolveUtil;
 import com.jetbrains.python.psi.resolve.QualifiedNameFinder;
 import com.jetbrains.python.psi.stubs.PropertyStubStorage;
@@ -159,31 +158,6 @@ public class PyClassImpl extends PyPresentableElementImpl<PyClassStub> implement
     return PyExpression.EMPTY_ARRAY;
   }
 
-  @NotNull
-  public PsiElement[] getSuperClassElements() {
-    final PyExpression[] superExpressions = getSuperClassExpressions();
-    List<PsiElement> superClasses = new ArrayList<PsiElement>();
-    for (PyExpression expr : superExpressions) {
-      if (expr instanceof PyKeywordArgument) {
-        continue;
-      }
-      superClasses.add(classElementFromExpression(expr));
-    }
-    return PsiUtilCore.toPsiElementArray(superClasses);
-  }
-
-  @Nullable
-  public static PsiElement classElementFromExpression(@NotNull PyExpression expression) {
-    expression = unfoldClass(expression);
-    if (expression instanceof PyReferenceExpression) {
-      final PsiPolyVariantReference ref = ((PyReferenceExpression)expression).getReference(PyResolveContext.noProperties());
-      if (ref != null) {
-        return ref.resolve();
-      }
-    }
-    return null;
-  }
-
   @NotNull
   public static PyExpression unfoldClass(@NotNull PyExpression expression) {
     if (expression instanceof PyCallExpression) {