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-8129 Change Signature: exception on processing incorrect call

Browse Source
This commit is contained in:
Ekaterina Tuzova
2013-01-15 12:34:20 +04:00
parent e9d7677357
commit e72fa6e79e
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureUsageProcessor.java
+12 -9
View File
@@ -284,8 +284,8 @@ public class PyChangeSignatureUsageProcessor implements ChangeSignatureUsageProc
final PyParameterInfo[] parameters = changeInfo.getNewParameters();
for (int i = 0; i != parameters.length; ++i) {
PyParameterInfo paramInfo = parameters[i];
if (paramInfo.getOldIndex() == i) {
final PyParameter[] oldParameters = function.getParameterList().getParameters();
final PyParameter[] oldParameters = function.getParameterList().getParameters();
if (paramInfo.getOldIndex() == i && i < oldParameters.length) {
final UsageInfo[] usages = RenameUtil.findUsages(oldParameters[i], paramInfo.getName(), true, false, null);
for (UsageInfo info : usages) {
RenameUtil.rename(info, paramInfo.getName());
@@ -334,7 +334,12 @@ public class PyChangeSignatureUsageProcessor implements ChangeSignatureUsageProc
for (int i = 0; i != parameters.length; ++i) {
PyParameterInfo info = parameters[i];
if (docstring != null && info.getOldIndex() < 0) {
final int oldIndex = info.getOldIndex();
if (i != 0 && oldIndex < oldParameters.length) {
builder.append(", ");
}
if (docstring != null && oldIndex < 0) {
final String replacement =
new PyDocstringGenerator(baseMethod).withParam("param", info.getName()).docStringAsText();
PyExpression str =
@@ -342,9 +347,10 @@ public class PyChangeSignatureUsageProcessor implements ChangeSignatureUsageProc
docstring.replace(str);
}
builder.append(info.getName());
if (info.getOldIndex() >= 0 && info.getOldIndex() < oldParameters.length) {
final PyParameter parameter = oldParameters[info.getOldIndex()];
if (oldIndex < oldParameters.length)
builder.append(info.getName());
if (oldIndex >= 0 && oldIndex < oldParameters.length) {
final PyParameter parameter = oldParameters[oldIndex];
if (parameter instanceof PyNamedParameter) {
final PyAnnotation annotation = ((PyNamedParameter)parameter).getAnnotation();
if (annotation != null) {
@@ -357,9 +363,6 @@ public class PyChangeSignatureUsageProcessor implements ChangeSignatureUsageProc
builder.append(" = ").append(defaultValue);
}
if (i != parameters.length - 1) {
builder.append(", ");
}
}
builder.append("): pass");