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-8096 Change Signature: produces invalid code on adding new parameters for function calls with keyword arguments

Browse Source
This commit is contained in:
Ekaterina Tuzova
2012-11-28 14:07:15 +04:00
parent d789caade2
commit 94ec43969a
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureDialog.java
+2 -2
View File
@@ -160,11 +160,11 @@ public class PyChangeSignatureDialog extends ChangeSignatureDialogBase<PyParamet
return PyBundle.message("ANN.regular.param.after.keyword");
}
final String defaultValue = parameter.getDefaultValue();
if (defaultValue != null && !StringUtil.isEmptyOrSpaces(defaultValue)) {
if (defaultValue != null && !StringUtil.isEmptyOrSpaces(defaultValue) && parameter.getDefaultInSignature()) {
hadDefaultValue = true;
}
else {
if (hadDefaultValue && parameter.getDefaultInSignature() && !hadSingleStar && (!languageLevel.isPy3K() || !hadPositionalContainer)) {
if (hadDefaultValue && !hadSingleStar && (!languageLevel.isPy3K() || !hadPositionalContainer)) {
return PyBundle.message("ANN.non.default.param.after.default");
}
}
python/testData/refactoring/changeSignature/nonDefaultAfterDefault1.py
+2
View File
@@ -0,0 +1,2 @@
def foo(b=1):
pass
python/testSrc/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureTest.java
+5
View File
@@ -96,6 +96,11 @@ public class PyChangeSignatureTest extends PyTestCase {
doValidationTest(null, Arrays.asList(new PyParameterInfo(-1, "a", "2", false), new PyParameterInfo(1, "b", "2", false)), null);
}
public void testNonDefaultAfterDefault1() {
doValidationTest(null, Arrays.asList(new PyParameterInfo(1, "b", "1", true), new PyParameterInfo(-1, "a", "2", false)),
PyBundle.message("ANN.non.default.param.after.default"));
}
public void doChangeSignatureTest(@Nullable String newName, @Nullable List<PyParameterInfo> parameters) {
myFixture.configureByFile("refactoring/changeSignature/" + getTestName(true) + ".before.py");
changeSignature(newName, parameters);