MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-22 06:21:25 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix a PY-7318 Converting dictionary creation to dictionary literal does not handle duplicate items correctly

Browse Source
This commit is contained in:
Ekaterina Tuzova
2013-02-19 15:03:31 +04:00
parent 1e22104473
commit 0f392dd6eb
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
python/src/com/jetbrains/python/inspections/quickfix/DictCreationQuickFix.java
View File

@@ -1,6 +1,7 @@
package com.jetbrains.python.inspections.quickfix;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.openapi.project.Project;
@@ -13,6 +14,7 @@ import com.jetbrains.python.psi.*;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.Map;
/**
* Created by IntelliJ IDEA.
@@ -41,11 +43,13 @@ public class DictCreationQuickFix implements LocalQuickFix {
@Override
public void applyFix(@NotNull final Project project, @NotNull final ProblemDescriptor descriptor) {
final PyElementGenerator elementGenerator = PyElementGenerator.getInstance(project);
final List<String> statements = Lists.newArrayList();
final Map<String, String> statementsMap = Maps.newLinkedHashMap();
final PyExpression assignedValue = myStatement.getAssignedValue();
if (assignedValue instanceof PyDictLiteralExpression) {
for (PyExpression expression: ((PyDictLiteralExpression)assignedValue).getElements()) {
statements.add(expression.getText());
for (PyKeyValueExpression expression: ((PyDictLiteralExpression)assignedValue).getElements()) {
final PyExpression value = expression.getValue();
if (value != null)
statementsMap.put(expression.getKey().getText(), value.getText());
}
PyStatement statement = PsiTreeUtil.getNextSiblingOfType(myStatement, PyStatement.class);
@@ -73,13 +77,17 @@ public class DictCreationQuickFix implements LocalQuickFix {
valueText = "("+targetToValue.second.getText()+")";
else
valueText = targetToValue.second.getText();
statements.add(indexText + ": " + valueText);
statementsMap.put(indexText, valueText);
statement.delete();
}
statement = nextStatement;
}
}
List<String> statements = Lists.newArrayList();
for (Map.Entry<String, String> entry : statementsMap.entrySet()) {
statements.add(entry.getKey() + ": " + entry.getValue());
}
final PyExpression expression = elementGenerator.createExpressionFromText(LanguageLevel.forElement(myStatement),
"{" + StringUtil.join(statements, ", ") + "}");
if (expression != null)

2
python/testData/inspections/DictCreationDuplicate.py Normal file
View File

@@ -0,0 +1,2 @@
<caret><weak_warning descr="This dictionary creation could be rewritten as a dictionary literal">data = { "1": 1, 0: ''}</weak_warning>
data[0] = "test"

1
python/testData/inspections/DictCreationDuplicate_after.py Normal file
View File

@@ -0,0 +1 @@
data = {"1": 1, 0: "test"}

4
python/testSrc/com/jetbrains/python/PyQuickFixTest.java
View File

@@ -138,6 +138,10 @@ public class PyQuickFixTest extends PyTestCase {
doInspectionTest("DictCreationTuple.py", PyDictCreationInspection.class, PyBundle.message("QFIX.dict.creation"), true, true);
}
public void testDictCreationDuplicate() { //PY-7318
doInspectionTest("DictCreationDuplicate.py", PyDictCreationInspection.class, PyBundle.message("QFIX.dict.creation"), true, true);
}
public void testTransformClassicClass() {
doInspectionTest("TransformClassicClass.py", PyClassicStyleClassInspection.class,
PyBundle.message("QFIX.classic.class.transform"), true, true);