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

Improve support for numbers as keys for dicts (PY-27375)

Browse Source
This commit is contained in:
Semyon Proshev
2018-03-22 21:48:59 +03:00
parent d5b422ad44
commit e2f1a8f960
3 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/inspections/PyDictDuplicateKeysInspection.java
+21 -8
View File
@@ -25,11 +25,13 @@ import com.intellij.psi.PsiElementVisitor;
import com.jetbrains.python.PyBundle;
import com.jetbrains.python.inspections.quickfix.PyRemoveDictKeyQuickFix;
import com.jetbrains.python.psi.*;
import com.jetbrains.python.psi.impl.PyBuiltinCache;
import com.jetbrains.python.psi.impl.PyPsiUtils;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
@@ -90,19 +92,30 @@ public class PyDictDuplicateKeysInspection extends PyInspection {
}
@Nullable
private static Pair<PsiElement, String> getDictLiteralKey(@NotNull PyKeyValueExpression argument) {
private Pair<PsiElement, String> getDictLiteralKey(@NotNull PyKeyValueExpression argument) {
final PyExpression key = argument.getKey();
final String keyValue = getKeyValue(key);
return keyValue != null ? Pair.createNonNull(key, keyValue) : null;
}
@Nullable
private static String getKeyValue(@NotNull PsiElement node) {
return node instanceof PyStringLiteralExpression
? ((PyStringLiteralExpression)node).getStringValue()
: node instanceof PyLiteralExpression || node instanceof PyReferenceExpression
? node.getText()
: null;
private String getKeyValue(@NotNull PsiElement node) {
if (node instanceof PyStringLiteralExpression) {
return ((PyStringLiteralExpression)node).getStringValue();
}
if (node instanceof PyNumericLiteralExpression) {
final BigDecimal value = ((PyNumericLiteralExpression)node).getBigDecimalValue();
if (value != null) {
final String keyValue = value.toPlainString();
return !value.equals(BigDecimal.ZERO) &&
myTypeEvalContext.getType((PyNumericLiteralExpression)node) == PyBuiltinCache.getInstance(node).getComplexType()
? keyValue + "j"
: keyValue;
}
}
return node instanceof PyLiteralExpression || node instanceof PyReferenceExpression ? node.getText() : null;
}
private void checkKey(@NotNull Map<String, PsiElement> map,
@@ -121,7 +134,7 @@ public class PyDictDuplicateKeysInspection extends PyInspection {
}
@Nullable
private static Pair<PsiElement, String> getDictCallKey(@Nullable PyExpression argument) {
private Pair<PsiElement, String> getDictCallKey(@Nullable PyExpression argument) {
if (argument instanceof PyParenthesizedExpression) {
final PyExpression expression = PyPsiUtils.flattenParens(argument);
if (expression instanceof PyTupleExpression) {
python/testData/inspections/PyDictDuplicateKeysInspection/test.py
+7 -1
View File
@@ -27,4 +27,10 @@ d = {<warning descr="Dictionary contains duplicate keys 'True'">True</warning>:
d = dict([(<warning descr="Dictionary contains duplicate keys 'True'">True</warning>, 1), (<warning descr="Dictionary contains duplicate keys 'True'">True</warning>, 2)])
d = {<warning descr="Dictionary contains duplicate keys 'None'">None</warning>: 1, <warning descr="Dictionary contains duplicate keys 'None'">None</warning>: 2}
d = dict([(<warning descr="Dictionary contains duplicate keys 'None'">None</warning>, 1), (<warning descr="Dictionary contains duplicate keys 'None'">None</warning>, 2)])
d = dict([(<warning descr="Dictionary contains duplicate keys 'None'">None</warning>, 1), (<warning descr="Dictionary contains duplicate keys 'None'">None</warning>, 2)])
d = {<warning descr="Dictionary contains duplicate keys '11'">11</warning>: 1, <warning descr="Dictionary contains duplicate keys '11'">1_1</warning>: 1}
d = {<warning descr="Dictionary contains duplicate keys '11.1'">11.1</warning>: 1, <warning descr="Dictionary contains duplicate keys '11.1'">1_1.1</warning>: 1}
d = {<warning descr="Dictionary contains duplicate keys '11j'">11j</warning>: 1, <warning descr="Dictionary contains duplicate keys '11j'">1_1j</warning>: 1}
d = {11j: 1, 11: 1}
d = {<warning descr="Dictionary contains duplicate keys '0'">0j</warning>: 1, <warning descr="Dictionary contains duplicate keys '0'">0</warning>: 2}
python/testSrc/com/jetbrains/python/PythonInspectionsTest.java
+1 -1
View File
@@ -210,7 +210,7 @@ public class PythonInspectionsTest extends PyTestCase {
}
public void testPyDictDuplicateKeysInspection() {
doHighlightingTest(PyDictDuplicateKeysInspection.class);
doHighlightingTest(PyDictDuplicateKeysInspection.class, LanguageLevel.PYTHON37);
}
public void testPyListCreationInspection() { //PY-2823