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

fixed PY-3315 Call to constructor of super class is missed: quick-fix for inspection (comment)

Browse Source
This commit is contained in:
Ekaterina Tuzova
2011-06-27 22:30:06 +04:00
parent e038fc1d14
commit 93fbf45e98
1 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/actions/AddCallSuperQuickFix.java
+30 -11
View File
@@ -24,7 +24,7 @@ import java.util.List;
*/
public class AddCallSuperQuickFix implements LocalQuickFix {
private final PyClass mySuper;
private final String mySuperName;
private String mySuperName;
public AddCallSuperQuickFix(PyClass superClass, String superName) {
mySuper = superClass;
@@ -44,10 +44,23 @@ public class AddCallSuperQuickFix implements LocalQuickFix {
public void applyFix(@NotNull final Project project, @NotNull final ProblemDescriptor descriptor) {
PyFunction problemFunction = PsiTreeUtil.getParentOfType(descriptor.getPsiElement(), PyFunction.class);
if (problemFunction == null) return;
PyFunction superInit = mySuper.findMethodByName(PyNames.INIT, false);
StringBuilder superCall = new StringBuilder(mySuperName);
StringBuilder superCall = new StringBuilder();
PyClass klass = problemFunction.getContainingClass();
boolean addComma = true;
if (klass != null && klass.isNewStyleClass()) {
addComma = false;
if (LanguageLevel.forElement(klass).isPy3K())
superCall.append("super().__init__(");
else
superCall.append("super("+klass.getName()+", self).__init__(");
}
else {
superCall.append(mySuperName);
superCall.append(".__init__(self");
}
StringBuilder newFunction = new StringBuilder("def __init__(self");
superCall.append(".__init__(self");
PyParameter[] parameters = problemFunction.getParameterList().getParameters();
List<String> problemParams = new ArrayList<String>();
@@ -82,29 +95,35 @@ public class AddCallSuperQuickFix implements LocalQuickFix {
else {
param = p.getText();
if (param.startsWith("**")) {
if (starName == null)
starName = p.getText();
continue;
}
if (param.startsWith("*")) {
if (doubleStarName == null)
doubleStarName = p.getText();
continue;
}
if (param.startsWith("*")) {
if (starName == null)
starName = p.getText();
continue;
}
}
superCall.append(",").append(param);
if (addComma)
superCall.append(",");
superCall.append(param);
if (!functionParams.contains(param))
newFunction.append(",").append(param);
addComma = true;
}
for(String p : problemParams)
newFunction.append(",").append(p);
if (starName != null) {
newFunction.append(",").append(starName);
superCall.append(",").append(starName);
if (addComma) superCall.append(",");
superCall.append(starName);
addComma = true;
}
if (doubleStarName != null) {
if (addComma) superCall.append(",");
superCall.append(doubleStarName);
newFunction.append(",").append(doubleStarName);
superCall.append(",").append(doubleStarName);
}
superCall.append(")");