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

fixed PY-9405 Method can be static: handle existing decorators

Browse Source
This commit is contained in:
Ekaterina Tuzova
2013-04-09 14:41:50 +04:00
parent 913e96ea0e
commit 6eb69aa83a
10 changed files with 111 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
python/psi-api/src/com/jetbrains/python/psi/PyElementGenerator.java
View File

@@ -91,4 +91,7 @@ public abstract class PyElementGenerator {
public abstract PyExpressionStatement createDocstring(String content);
public abstract PyPassStatement createPassStatement();
@NotNull
public abstract PyDecoratorList createDecoratorList(@NotNull final String... decoratorTexts);
}

31
python/src/com/jetbrains/python/inspections/quickfix/PyMakeMethodStaticQuickFix.java
View File

@@ -10,6 +10,9 @@ import com.jetbrains.python.psi.*;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
/**
* User: ktisha
*/
@@ -32,18 +35,26 @@ public class PyMakeMethodStaticQuickFix implements LocalQuickFix {
final PsiElement element = descriptor.getPsiElement();
final PyFunction problemFunction = PsiTreeUtil.getParentOfType(element, PyFunction.class);
if (problemFunction == null) return;
if (!PyUtil.deleteParameter(problemFunction, 0)) return;
PyUtil.deleteParameter(problemFunction, 0);
final PyDecoratorList problemDecoratorList = problemFunction.getDecoratorList();
List<String> decoTexts = new ArrayList<String>();
decoTexts.add("@staticmethod");
if (problemDecoratorList != null) {
final PyDecorator[] decorators = problemDecoratorList.getDecorators();
for (PyDecorator deco : decorators) {
decoTexts.add(deco.getText());
}
}
PyElementGenerator generator = PyElementGenerator.getInstance(project);
final PyFunction function =
generator.createFromText(LanguageLevel.forElement(problemFunction), PyFunction.class, "@staticmethod\ndef foo():\n\tpass");
final PyDecoratorList decoratorList = function.getDecoratorList();
assert decoratorList != null;
final PyDecorator[] decorators = decoratorList.getDecorators();
final PyDecorator decorator = decorators[0];
problemFunction.addBefore(decorator, problemFunction.getFirstChild());
final PyDecoratorList decoratorList = generator.createDecoratorList(decoTexts.toArray(new String[decoTexts.size()]));
if (problemDecoratorList != null) {
problemDecoratorList.replace(decoratorList);
}
else {
problemFunction.addBefore(decoratorList, problemFunction.getFirstChild());
}
}
}

16
python/src/com/jetbrains/python/psi/impl/PyElementGeneratorImpl.java
View File

@@ -324,6 +324,22 @@ public class PyElementGeneratorImpl extends PyElementGenerator {
return (PyPassStatement)statementList.getStatements()[0];
}
@NotNull
@Override
public PyDecoratorList createDecoratorList(@NotNull final String... decoratorTexts) {
assert decoratorTexts.length > 0;
StringBuilder functionText = new StringBuilder();
for (String decoText : decoratorTexts) {
functionText.append(decoText).append("\n");
}
functionText.append("def foo():\n\tpass");
final PyFunction function = createFromText(LanguageLevel.getDefault(), PyFunction.class,
functionText.toString());
final PyDecoratorList decoratorList = function.getDecoratorList();
assert decoratorList != null;
return decoratorList;
}
private PyStatementList createPassStatementList() {
final PyFunction function = createFromText(LanguageLevel.getDefault(), PyFunction.class, "def foo():\n\tpass");
return function.getStatementList();

10
python/testData/quickFixes/PyMakeMethodStaticQuickFixTest/decoWithParams.py Normal file
View File

@@ -0,0 +1,10 @@
__author__ = 'ktisha'
def foo(x):
return x
class A():
@accepts(int, int)
def my_<caret>method(self):
print "Smth"

11
python/testData/quickFixes/PyMakeMethodStaticQuickFixTest/decoWithParams_after.py Normal file
View File

@@ -0,0 +1,11 @@
__author__ = 'ktisha'
def foo(x):
return x
class A():
@staticmethod
@accepts(int, int)
def my_<caret>method():
print "Smth"

10
python/testData/quickFixes/PyMakeMethodStaticQuickFixTest/functionWithDeco.py Normal file
View File

@@ -0,0 +1,10 @@
__author__ = 'ktisha'
def foo(x):
return x
class A():
@my_deco
def my_<caret>method(self):
print "Smth"

11
python/testData/quickFixes/PyMakeMethodStaticQuickFixTest/functionWithDeco_after.py Normal file
View File

@@ -0,0 +1,11 @@
__author__ = 'ktisha'
def foo(x):
return x
class A():
@staticmethod
@my_deco
def my_method():
print "Smth"

8
python/testData/quickFixes/PyMakeMethodStaticQuickFixTest/noSelf.py Normal file
View File

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

9
python/testData/quickFixes/PyMakeMethodStaticQuickFixTest/noSelf_after.py Normal file
View File

@@ -0,0 +1,9 @@
__author__ = 'ktisha'
class Child(Base):
def __init__(self):
super(Child, self).__init__()
@staticmethod
def f():
test = 1

12
python/testSrc/com/jetbrains/python/quickFixes/PyMakeMethodStaticQuickFixTest.java
View File

@@ -20,4 +20,16 @@ public class PyMakeMethodStaticQuickFixTest extends PyQuickFixTestCase {
doInspectionTest(PyMethodMayBeStaticInspection.class, PyBundle.message("QFIX.NAME.make.static"));
}
public void testFunctionWithDeco() {
doInspectionTest(PyMethodMayBeStaticInspection.class, PyBundle.message("QFIX.NAME.make.static"));
}
public void testDecoWithParams() {
doInspectionTest(PyMethodMayBeStaticInspection.class, PyBundle.message("QFIX.NAME.make.static"));
}
public void testNoSelf() {
doInspectionTest(PyMethodMayBeStaticInspection.class, PyBundle.message("QFIX.NAME.make.static"));
}
}