make method static: delete receiver parameter (IDEA-223325)

GitOrigin-RevId: d27b8454d8f653072ff627a8048f89fde3491316

java/java-impl/src/com/intellij/refactoring/makeStatic/MakeMethodStaticProcessor.java

@@ -229,6 +229,11 @@ public class MakeMethodStaticProcessor extends MakeMethodOrClassStaticProcessor<
     modifierList.setModifierProperty(PsiModifier.STATIC, true);
     modifierList.setModifierProperty(PsiModifier.FINAL, false);
     modifierList.setModifierProperty(PsiModifier.DEFAULT, false);
+
+    PsiReceiverParameter receiverParameter = PsiTreeUtil.getChildOfType(member.getParameterList(), PsiReceiverParameter.class);
+    if (receiverParameter != null) {
+      receiverParameter.delete();
+    }
   }
 
   @Override

java/java-impl/src/com/intellij/refactoring/makeStatic/MakeStaticUtil.java

@@ -51,7 +51,7 @@ public final class MakeStaticUtil {
         }
       }
     }
-    else if (element instanceof PsiThisExpression) {
+    else if (element instanceof PsiThisExpression && !(element.getParent() instanceof PsiReceiverParameter)) {
       PsiJavaCodeReferenceElement qualifier = ((PsiThisExpression) element).getQualifier();
       PsiElement refElement = qualifier != null ?
           qualifier.resolve() : PsiTreeUtil.getParentOfType(element, PsiClass.class);

java/java-tests/testData/refactoring/makeMethodStatic/afterReceiverParameter.java

@@ -0,0 +1,3 @@
+public class Test {
+    public static void test123(int i) { }
+}

java/java-tests/testData/refactoring/makeMethodStatic/beforeReceiverParameter.java

@@ -0,0 +1,3 @@
+public class Test {
+    public void <caret>test123(Test this, int i) { }
+}

java/java-tests/testSrc/com/intellij/java/refactoring/MakeMethodStaticTest.java

@@ -218,6 +218,8 @@ public class MakeMethodStaticTest extends LightRefactoringTestCase {
   public void testPreserveParametersAlignment() {
     doTest();
   }
+  
+  public void testReceiverParameter() { doTest(); }
 
   public void testDelegatePlace() {
     doTest(true, true);