inline: fix qualifier which is inserted to specify type params after inline (IDEA-104536)

java/java-impl/src/com/intellij/refactoring/util/InlineUtil.java

@@ -86,7 +86,7 @@ public class InlineUtil {
                   if (method.getModifierList().hasModifierProperty(PsiModifier.STATIC)) {
                     methodExpression.setQualifierExpression(elementFactory.createReferenceExpression(containingClass));
                   } else {
-                    methodExpression.setQualifierExpression(createThisExpression(manager, containingClass, refParent));
+                    methodExpression.setQualifierExpression(createThisExpression(manager, thisClass, refParent));
                   }
                 }
               }

java/java-tests/testData/refactoring/inlineLocal/EnclosingThisExpression.java

@@ -0,0 +1,17 @@
+import java.util.*;
+class GrCaseLabel {
+}
+
+class A0 {
+  protected <T> List<T> findChildrenByType() {
+    return null;
+  }
+}
+
+class A extends A0 {
+  void f() {
+    final List<GrCaseLabel> labels = findChildrenByType();
+    for (GrCaseLabel label : la<caret>bels) {
+    }
+  }
+}

java/java-tests/testData/refactoring/inlineLocal/EnclosingThisExpression.java.after

@@ -0,0 +1,16 @@
+import java.util.*;
+class GrCaseLabel {
+}
+
+class A0 {
+  protected <T> List<T> findChildrenByType() {
+    return null;
+  }
+}
+
+class A extends A0 {
+  void f() {
+      for (GrCaseLabel label : this.<GrCaseLabel>findChildrenByType()) {
+    }
+  }
+}

java/java-tests/testData/refactoring/inlineLocal/ParentStaticQualifier.java

@@ -0,0 +1,17 @@
+import java.util.*;
+class GrCaseLabel {
+}
+
+class A0 {
+  protected static <T> List<T> findChildrenByType() {
+    return null;
+  }
+}
+
+class A extends A0 {
+  void f() {
+    final List<GrCaseLabel> labels = findChildrenByType();
+    for (GrCaseLabel label : la<caret>bels) {
+    }
+  }
+}

java/java-tests/testData/refactoring/inlineLocal/ParentStaticQualifier.java.after

@@ -0,0 +1,16 @@
+import java.util.*;
+class GrCaseLabel {
+}
+
+class A0 {
+  protected static <T> List<T> findChildrenByType() {
+    return null;
+  }
+}
+
+class A extends A0 {
+  void f() {
+      for (GrCaseLabel label : A0.<GrCaseLabel>findChildrenByType()) {
+    }
+  }
+}

java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLocalTest.java

@@ -205,6 +205,14 @@ public class InlineLocalTest extends LightCodeInsightTestCase {
     doTest(true);
   }
 
+  public void testEnclosingThisExpression() throws Exception {
+    doTest(true);
+  }
+
+  public void testParentStaticQualifier() throws Exception {
+    doTest(true);
+  }
+
   public void testLocalVarInsideLambdaBodyWriteUsage() throws Exception {
     doTest(true, "Cannot perform refactoring.\n" +
                  "Variable 'hello' is accessed for writing.");