diff --git a/java/openapi/src/com/intellij/psi/util/TypeConversionUtil.java b/java/openapi/src/com/intellij/psi/util/TypeConversionUtil.java
index 7e78384b8530..7c8cf30753bd 100644
--- a/java/openapi/src/com/intellij/psi/util/TypeConversionUtil.java
+++ b/java/openapi/src/com/intellij/psi/util/TypeConversionUtil.java
@@ -923,6 +923,12 @@ public class TypeConversionUtil {
     return substitutor;
   }
 
+  @NotNull
+  public static PsiSubstitutor getSuperClassSubstitutor(@NotNull PsiClass superClass, @NotNull PsiClassType classType) {
+      final PsiClassType.ClassResolveResult classResolveResult = classType.resolveGenerics();
+      return getSuperClassSubstitutor(superClass, classResolveResult.getElement(), classResolveResult.getSubstitutor());
+  }
+
   private static PsiSubstitutor getSuperClassSubstitutorInner(PsiClass base,
                                                               PsiClass candidate,
                                                               PsiSubstitutor candidateSubstitutor,