IDEA-CR-51590: added self parameter for methods on smart enter (PY-35163)

self is inserted for methods that are not class-/staticmethod
cls is inserted for classmethod
empty parameter list for staticmethod

GitOrigin-RevId: 9743ae50c89c069b8123b8b6eb26fb841dd1f5b2

python/src/com/jetbrains/python/codeInsight/editorActions/smartEnter/fixers/PyParameterListFixer.java

@@ -19,6 +19,7 @@ import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.IncorrectOperationException;
+import com.jetbrains.python.PyNames;
 import com.jetbrains.python.PyTokenTypes;
 import com.jetbrains.python.codeInsight.editorActions.smartEnter.PySmartEnterProcessor;
 import com.jetbrains.python.psi.PyFunction;
@@ -48,13 +49,31 @@ public class PyParameterListFixer extends PyFixer<PyParameterList> {
       if (lBrace == null) {
         final String textToInsert = pyFunction.getNameNode() == null ? " (" : "(";
         document.insertString(parameters.getTextOffset(), textToInsert);
+        insertParametersForMethod(pyFunction, document, parameters.getTextOffset() + textToInsert.length());
       }
       else if (parameters.getParameters().length == 0) {
-        document.insertString(lBrace.getTextRange().getEndOffset(), ")");
+        final int lBraceOffset = lBrace.getTextRange().getEndOffset();
+        final int offsetWithParam = insertParametersForMethod(pyFunction, document, lBraceOffset);
+        document.insertString(offsetWithParam, ")");
       }
       else {
         document.insertString(parameters.getTextRange().getEndOffset(), ")");
       }
     }
   }
+
+  private static int insertParametersForMethod(@NotNull PyFunction pyFunction, @NotNull Document document, int offset) {
+    if (pyFunction.getContainingClass() != null) {
+      final PyFunction.Modifier modifier = pyFunction.getModifier();
+      String parameterName = null;
+      if (modifier == null) parameterName = PyNames.CANONICAL_SELF;
+      else if (modifier == PyFunction.Modifier.CLASSMETHOD) parameterName = PyNames.CANONICAL_CLS;
+
+      if (parameterName != null) {
+        document.insertString(offset, parameterName);
+        return offset + parameterName.length();
+      }
+    }
+    return offset;
+  }
 }

python/testData/codeInsight/smartEnter/methodParameterClassMethod.py

@@ -0,0 +1,4 @@
+class MyClass:
+
+    @classmethod
+    def method<caret>

python/testData/codeInsight/smartEnter/methodParameterClassMethod_after.py

@@ -0,0 +1,5 @@
+class MyClass:
+
+    @classmethod
+    def method(cls):
+        <caret>

python/testData/codeInsight/smartEnter/methodParameterNoDecorators.py

@@ -0,0 +1,3 @@
+class MyClass:
+
+    def method<caret>

python/testData/codeInsight/smartEnter/methodParameterNoDecorators_after.py

@@ -0,0 +1,4 @@
+class MyClass:
+
+    def method(self):
+        <caret>

python/testData/codeInsight/smartEnter/methodParameterStaticMethod.py

@@ -0,0 +1,4 @@
+class MyClass:
+
+    @staticmethod
+    def method<caret>

python/testData/codeInsight/smartEnter/methodParameterStaticMethod_after.py

@@ -0,0 +1,5 @@
+class MyClass:
+
+    @staticmethod
+    def method():
+        <caret>

python/testData/codeInsight/smartEnter/methodParameterWithExistingParameters.py

@@ -0,0 +1,3 @@
+class MyClass:
+
+    def method(self, x, y<caret>

python/testData/codeInsight/smartEnter/methodParameterWithExistingParameters_after.py

@@ -0,0 +1,4 @@
+class MyClass:
+
+    def method(self, x, y):
+        <caret>

python/testData/codeInsight/smartEnter/methodParameterWithOpenBracket.py

@@ -0,0 +1,3 @@
+class MyClass:
+
+    def method(<caret>

python/testData/codeInsight/smartEnter/methodParameterWithOpenBracket_after.py

@@ -0,0 +1,4 @@
+class MyClass:
+
+    def method(self):
+        <caret>

python/testSrc/com/jetbrains/python/PySmartEnterTest.java

@@ -188,6 +188,31 @@ public class PySmartEnterTest extends PyTestCase {
     doTest();
   }
 
+  // PY-35163
+  public void testMethodParameterNoDecorators() {
+    doTest();
+  }
+
+  // PY-35163
+  public void testMethodParameterClassMethod() {
+    doTest();
+  }
+
+  // PY-35163
+  public void testMethodParameterStaticMethod() {
+    doTest();
+  }
+
+  // PY-35163
+  public void testMethodParameterWithExistingParameters() {
+    doTest();
+  }
+
+  // PY-35163
+  public void testMethodParameterWithOpenBracket() {
+    doTest();
+  }
+
   // PY-12877
   public void testWithTargetOmitted() {
     doTest();