MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-17392 Cleanup in PyDefaultArgumentQuickFix

Browse Source 
* Added "final" modifiers
* Add braces to conditionals
This commit is contained in:
Mikhail Golubev
2015-10-30 15:59:43 +03:00
parent 28788c61b6
commit c67e042501
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/inspections/quickfix/PyDefaultArgumentQuickFix.java
+23 -18
View File
@@ -51,40 +51,45 @@ public class PyDefaultArgumentQuickFix implements LocalQuickFix {
@Override
public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
PsiElement defaultValue = descriptor.getPsiElement();
PyNamedParameter param = PsiTreeUtil.getParentOfType(defaultValue, PyNamedParameter.class);
PyFunction function = PsiTreeUtil.getParentOfType(defaultValue, PyFunction.class);
final PsiElement defaultValue = descriptor.getPsiElement();
final PyNamedParameter param = PsiTreeUtil.getParentOfType(defaultValue, PyNamedParameter.class);
final PyFunction function = PsiTreeUtil.getParentOfType(defaultValue, PyFunction.class);
assert param != null;
String defName = param.getName();
final String defName = param.getName();
if (function != null) {
PyElementGenerator elementGenerator = PyElementGenerator.getInstance(project);
PyStatementList list = function.getStatementList();
PyParameterList paramList = function.getParameterList();
final PyElementGenerator elementGenerator = PyElementGenerator.getInstance(project);
final PyStatementList list = function.getStatementList();
final PyParameterList paramList = function.getParameterList();
final StringBuilder functionText = new StringBuilder("def " + function.getName() + "(");
int size = paramList.getParameters().length;
for (int i = 0; i != size; ++i) {
PyParameter p = paramList.getParameters()[i];
if (p == param)
final int size = paramList.getParameters().length;
for (int i = 0; i < size; i++) {
final PyParameter p = paramList.getParameters()[i];
if (p == param) {
functionText.append(defName).append("=None");
else
}
else {
functionText.append(p.getText());
if (i != size-1)
}
if (i != size-1) {
functionText.append(", ");
}
}
functionText.append("):\n\tif not ").append(defName).append(":\n\t\t").append(defName).append(" = ").append(defaultValue.getText());
final PyStatement[] statements = list.getStatements();
PyStatement firstStatement = statements.length > 0 ? statements[0] : null;
PyFunction newFunction = elementGenerator.createFromText(LanguageLevel.forElement(function), PyFunction.class,
functionText.toString());
final PyStatement firstStatement = statements.length > 0 ? statements[0] : null;
final PyFunction newFunction = elementGenerator.createFromText(LanguageLevel.forElement(function), PyFunction.class,
functionText.toString());
if (firstStatement == null) {
function.replace(newFunction);
}
else {
final PyStatement ifStatement = newFunction.getStatementList().getStatements()[0];
PyStringLiteralExpression docString = function.getDocStringExpression();
if (docString != null)
final PyStringLiteralExpression docString = function.getDocStringExpression();
if (docString != null) {
list.addAfter(ifStatement, firstStatement);
}
else {
list.addBefore(ifStatement, firstStatement);
}