MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-20 05:21:29 +07:00
Code Issues Packages Projects Releases Wiki Activity

fixed PY-9406 Make function from method: when removing last method from class add pass statement

Browse Source
This commit is contained in:
Ekaterina Tuzova
2013-04-09 14:08:09 +04:00
parent 46e58f10c1
commit 913e96ea0e
6 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
python/src/com/jetbrains/python/inspections/quickfix/PyMakeFunctionFromMethodQuickFix.java
View File

@@ -36,11 +36,14 @@ public class PyMakeFunctionFromMethodQuickFix implements LocalQuickFix {
final PyClass containingClass = problemFunction.getContainingClass();
if (containingClass == null) return;
if (!PyUtil.deleteParameter(problemFunction, 0)) return;
PyUtil.deleteParameter(problemFunction, 0);
final PsiElement copy = problemFunction.copy();
final PyStatementList classStatementList = containingClass.getStatementList();
classStatementList.deleteChildRange(problemFunction, problemFunction);
if (classStatementList.getStatements().length < 1) {
classStatementList.add(PyElementGenerator.getInstance(project).createPassStatement());
}
final PsiFile file = containingClass.getContainingFile();
file.addAfter(copy, containingClass);
}

5
python/testData/quickFixes/PyMakeFunctionFromMethodQuickFixTest/emptyStatementList.py Normal file
View File

@@ -0,0 +1,5 @@
__author__ = 'ktisha'
class Child(Base):
def <caret>f(self):
test = 1

8
python/testData/quickFixes/PyMakeFunctionFromMethodQuickFixTest/emptyStatementList_after.py Normal file
View File

@@ -0,0 +1,8 @@
__author__ = 'ktisha'
class Child(Base):
pass
def f():
test = 1

5
python/testData/quickFixes/PyMakeFunctionFromMethodQuickFixTest/noSelf.py Normal file
View File

@@ -0,0 +1,5 @@
__author__ = 'ktisha'
class Child(Base):
def <caret>f():
test = 1

8
python/testData/quickFixes/PyMakeFunctionFromMethodQuickFixTest/noSelf_after.py Normal file
View File

@@ -0,0 +1,8 @@
__author__ = 'ktisha'
class Child(Base):
pass
def f():
test = 1

8
python/testSrc/com/jetbrains/python/quickFixes/PyMakeFunctionFromMethodQuickFixTest.java
View File

@@ -24,4 +24,12 @@ public class PyMakeFunctionFromMethodQuickFixTest extends PyQuickFixTestCase {
doInspectionTest(PyMethodMayBeStaticInspection.class, PyBundle.message("QFIX.NAME.make.function"));
}
public void testEmptyStatementList() {
doInspectionTest(PyMethodMayBeStaticInspection.class, PyBundle.message("QFIX.NAME.make.function"));
}
public void testNoSelf() {
doInspectionTest(PyMethodMayBeStaticInspection.class, PyBundle.message("QFIX.NAME.make.function"));
}
}