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

Fix tests

Browse Source
This commit is contained in:
Valentina Kiryushkina
2017-05-15 14:37:55 +03:00
committed by Valentina Kiryushkina
parent ed6c1d127d
commit 78d9f96481
6 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/PySubstitutionChunkReference.java
+2 -2
View File
@@ -321,14 +321,14 @@ public class PySubstitutionChunkReference extends PsiReferenceBase<PyStringLiter
for (PyExpression element : elements) {
if (element instanceof PyStarExpression) {
if (!LanguageLevel.forElement(element).isAtLeast(LanguageLevel.PYTHON35)) continue;
final PyExpression underStarExpr = ((PyStarExpression)element).getExpression();
final PyExpression underStarExpr = PyPsiUtils.flattenParens(((PyStarExpression)element).getExpression());
if (PyUtil.instanceOf(underStarExpr, PyListLiteralExpression.class, PyTupleExpression.class)) {
PyExpression[] subsequenсeElements = getElementsFromListOrTuple(underStarExpr);
int subsequenceElementIndex = index - seenElementsNumber;
if (subsequenceElementIndex < subsequenсeElements.length) {
return Ref.create(subsequenсeElements[subsequenceElementIndex]);
}
if (noElementsForSure) noElementsForSure = Arrays.stream(subsequenсeElements).anyMatch(it -> it instanceof PyStarExpression);
if (noElementsForSure) noElementsForSure = Arrays.stream(subsequenсeElements).noneMatch(it -> it instanceof PyStarExpression);
seenElementsNumber += subsequenсeElements.length;
}
else {
python/testData/inspections/PyStringFormatInspection/PackedListInsideList.py
+1 -1
View File
@@ -1,2 +1,2 @@
"{3}".format(*[1, 2, *[3, 4]])
"{4}".format(*[1, 2, *[3, 4]])
<warning descr="Too few arguments for format string">"{4}"</warning>.format(*[1, 2, *[3, 4]])
python/testData/inspections/PyStringFormatInspection/PackedListInsideTuple.py
+2
View File
@@ -0,0 +1,2 @@
"{2}".format(*(1, 2, *[3, 4]))
<warning descr="Too few arguments for format string">"{4}"</warning>.format(*(1, 2, *[3, 4]))
python/testData/inspections/PyStringFormatInspection/PackedTupleInsideList.py
+1 -1
View File
@@ -1,2 +1,2 @@
"{3}".format(*[1, 2, *(3, 4)])
"{4}".format(*[1, 2, *(3, 4)])
<warning descr="Too few arguments for format string">"{4}"</warning>.format(*[1, 2, *(3, 4)])
python/testData/inspections/PyStringFormatInspection/PackedTupleInsideTuple.py
+1 -1
View File
@@ -1,2 +1,2 @@
"{3}".format(*(1, 2, *(3, 4)))
"{4}".format(*(1, 2, *(3, 4)))
<warning descr="Too few arguments for format string">"{4}"</warning>.format(*(1, 2, *(3, 4)))
python/testSrc/com/jetbrains/python/inspections/Py3StringFormatInspectionTest.java
+3
View File
@@ -65,6 +65,9 @@ public class Py3StringFormatInspectionTest extends PyTestCase {
runWithLanguageLevel(LanguageLevel.PYTHON35, this::doTest);
}
public void testPackedListInsideTuple() {
runWithLanguageLevel(LanguageLevel.PYTHON35, this::doTest);
}
private void doTest() {
myFixture.configureByFile(TEST_DIRECTORY + getTestName(false) + ".py");