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

PY-21161 Handle not-trivial format specs in printf-style formatting better

Browse Source
This commit is contained in:
Mikhail Golubev
2016-10-25 21:30:13 +03:00
parent 84422a7250
commit 06286a59a2
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/intentions/PyConvertToFStringIntention.java
+7 -10
View File
@@ -46,6 +46,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import static com.jetbrains.python.codeInsight.intentions.ConvertFormatOperatorToMethodIntention.convertFormatSpec;
import static com.jetbrains.python.psi.PyUtil.as;
/**
@@ -221,13 +222,12 @@ public class PyConvertToFStringIntention extends PyBaseIntentionAction {
else {
final SubstitutionChunk subsChunk = (SubstitutionChunk)chunk;
final char conversionChar = subsChunk.getConversionType();
final String widthAndPrecision;
if (StringUtil.isNotEmpty(subsChunk.getWidth()) || StringUtil.isNotEmpty(subsChunk.getPrecision())) {
widthAndPrecision = StringUtil.notNullize(subsChunk.getWidth()) + "." + StringUtil.notNullize(subsChunk.getPrecision());
}
else {
widthAndPrecision = "";
String widthAndPrecision = StringUtil.notNullize(subsChunk.getWidth());
if (StringUtil.isNotEmpty(subsChunk.getPrecision())) {
widthAndPrecision += "." + subsChunk.getPrecision();
}
final String conversionFlags = subsChunk.getConversionFlags();
result.append("{");
@@ -251,10 +251,7 @@ public class PyConvertToFStringIntention extends PyBaseIntentionAction {
result.append(":");
}
if (StringUtil.isNotEmpty(conversionFlags)) {
final String conversionStr = String.valueOf(conversionChar);
result.append(ConvertFormatOperatorToMethodIntention.convertFormatSpec(conversionFlags, widthAndPrecision, conversionStr));
}
result.append(convertFormatSpec(StringUtil.notNullize(conversionFlags), widthAndPrecision, String.valueOf(conversionChar)));
if (StringUtil.isNotEmpty(widthAndPrecision)) {
result.append(widthAndPrecision);
python/testData/intentions/PyConvertToFStringIntentionTest/percentOperatorWidthAndPrecision.py
+1
View File
@@ -0,0 +1 @@
'%.5d %3.5d %3d %20s %-#d' % (1, 2, 3, 'spam', 4)
python/testData/intentions/PyConvertToFStringIntentionTest/percentOperatorWidthAndPrecision_after.py
+1
View File
@@ -0,0 +1 @@
f'{1:.5d} {2:3.5d} {3:3d} {"spam":>20} {4:<#d}'
python/testSrc/com/jetbrains/python/intentions/PyConvertToFStringIntentionTest.java
+4
View File
@@ -96,6 +96,10 @@ public class PyConvertToFStringIntentionTest extends PyIntentionTestCase {
doTest();
}
public void testPercentOperatorWidthAndPrecision() {
doTest();
}
public void testExtractItemAndAttributeAccess() {
assertSameElements(PyConvertToFStringIntention.extractItemsAndAttributes("{0.foo.bar.baz}"), ".foo", ".bar", ".baz");
assertSameElements(PyConvertToFStringIntention.extractItemsAndAttributes("{0[foo][.!:][}]}"), "[foo]", "[.!:]", "[}]");