redundant cast: take into account custom return type processing for getClass (IDEA-109527)

java/java-psi-api/src/com/intellij/psi/util/RedundantCastUtil.java

@@ -251,8 +251,8 @@ public class RedundantCastUtil {
         final JavaResolveResult newResult = newCall.getMethodExpression().advancedResolve(false);
         if (!newResult.isValidResult()) return;
         final PsiMethod newTargetMethod = (PsiMethod)newResult.getElement();
-        final PsiType newReturnType = newResult.getSubstitutor().substitute(newTargetMethod.getReturnType());
-        final PsiType oldReturnType = resolveResult.getSubstitutor().substitute(targetMethod.getReturnType());
+        final PsiType newReturnType = newCall.getType();
+        final PsiType oldReturnType = methodCall.getType();
         if (Comparing.equal(newReturnType, oldReturnType)) {
           if (newTargetMethod.equals(targetMethod) ||
               (newTargetMethod.getSignature(newResult.getSubstitutor()).equals(targetMethod.getSignature(resolveResult.getSubstitutor())) &&

java/java-tests/testData/inspection/redundantCast/generics/GetClassProcessing/expected.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<problems/>

java/java-tests/testData/inspection/redundantCast/generics/GetClassProcessing/src/Test.java

@@ -0,0 +1,10 @@
+class B { }
+class A extends B { }
+
+class C {
+  void m(Class<? extends A> c) {}
+
+  void x(B b) {
+    m(((A)b).getClass());
+  }
+}

java/java-tests/testSrc/com/intellij/codeInspection/RedundantCast15Test.java

@@ -46,6 +46,7 @@ public class RedundantCast15Test extends InspectionTestCase {
   public void testIDEA22899() throws Exception { doTest();}
   public void testRawCast1() throws Exception { doTest();}
   public void testInferenceFromCast() throws Exception { doTest();}
+  public void testGetClassProcessing() throws Exception { doTest();}
 
   public void testTypeParameterAccessChecksJava7() throws Exception {
     ((JavaVersionServiceImpl)JavaVersionService.getInstance()).setTestVersion(JavaSdkVersion.JDK_1_7, getTestRootDisposable());