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-6756 PyCharm erroneously reports "too many arguments" for certain string formatting lines.

Browse Source
This commit is contained in:
Ekaterina Tuzova
2012-06-28 16:08:49 +04:00
parent 275232be1b
commit c55ba62991
1 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/inspections/PyStringFormatInspection.java
+31 -35
View File
@@ -181,42 +181,38 @@ public class PyStringFormatInspection extends PyInspection {
return 1;
}
}
else if (rightExpression instanceof PySliceExpression) {
if (s != null) {
PyType type = ((PySliceExpression)rightExpression).getOperand().getType(myTypeEvalContext);
if (type != null) {
if ("list".equals(type.getName()) || "str".equals(type.getName())) {
checkTypeCompatible(problemTarget, builtinCache.getStrType(),
PyTypeParser.getTypeByName(problemTarget, s));
return 1;
}
}
PySliceItem sliceItem = ((PySliceExpression)rightExpression).getSliceItem();
if (sliceItem != null) {
PyExpression lower = sliceItem.getLowerBound();
PyExpression upper = sliceItem.getUpperBound();
PyExpression stride = sliceItem.getStride();
if (upper instanceof PyNumericLiteralExpression) {
BigInteger lowerVal;
if (lower instanceof PyNumericLiteralExpression ) {
lowerVal = ((PyNumericLiteralExpression)lower).getBigIntegerValue();
}
else {
lowerVal = BigInteger.ZERO;
}
int count = (((PyNumericLiteralExpression)upper).getBigIntegerValue().subtract(lowerVal)).intValue();
int strideVal;
if (stride instanceof PyNumericLiteralExpression)
strideVal = ((PyNumericLiteralExpression)stride).getBigIntegerValue().intValue();
else
strideVal = 1;
int res = count/strideVal;
int residue = count%strideVal == 0 ? 0 : 1;
return res + residue;
}
}
return -1;
else if (rightExpression instanceof PySliceExpression && s != null) {
final PyType type = ((PySliceExpression)rightExpression).getOperand().getType(myTypeEvalContext);
if (type == null || "list".equals(type.getName()) || "str".equals(type.getName())) {
checkTypeCompatible(problemTarget, builtinCache.getStrType(),
PyTypeParser.getTypeByName(problemTarget, s));
return 1;
}
PySliceItem sliceItem = ((PySliceExpression)rightExpression).getSliceItem();
if (sliceItem != null) {
PyExpression lower = sliceItem.getLowerBound();
PyExpression upper = sliceItem.getUpperBound();
PyExpression stride = sliceItem.getStride();
if (upper instanceof PyNumericLiteralExpression) {
BigInteger lowerVal;
if (lower instanceof PyNumericLiteralExpression ) {
lowerVal = ((PyNumericLiteralExpression)lower).getBigIntegerValue();
}
else {
lowerVal = BigInteger.ZERO;
}
int count = (((PyNumericLiteralExpression)upper).getBigIntegerValue().subtract(lowerVal)).intValue();
int strideVal;
if (stride instanceof PyNumericLiteralExpression)
strideVal = ((PyNumericLiteralExpression)stride).getBigIntegerValue().intValue();
else
strideVal = 1;
int res = count/strideVal;
int residue = count%strideVal == 0 ? 0 : 1;
return res + residue;
}
}
return -1;
}
return -1;
}