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 Don't suggest intention for string methods other than "format"

Browse Source
This commit is contained in:
Mikhail Golubev
2016-10-25 21:30:13 +03:00
parent 06286a59a2
commit a88719627f
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/intentions/PyConvertToFStringIntention.java
+2 -1
View File
@@ -27,6 +27,7 @@ import com.intellij.psi.PsiFile;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException;
import com.jetbrains.python.PyBundle;
import com.jetbrains.python.PyNames;
import com.jetbrains.python.PyTokenTypes;
import com.jetbrains.python.codeInsight.PySubstitutionChunkReference;
import com.jetbrains.python.codeInsight.PythonFormattedStringReferenceProvider;
@@ -180,7 +181,7 @@ public class PyConvertToFStringIntention extends PyBaseIntentionAction {
final PyCallExpression callExpr = PsiTreeUtil.getParentOfType(anchor, PyCallExpression.class);
if (callExpr != null) {
final PyReferenceExpression callee = as(callExpr.getCallee(), PyReferenceExpression.class);
if (callee != null) {
if (callee != null && PyNames.FORMAT.equals(callee.getName())) {
final PyStringLiteralExpression pyString = as(callee.getQualifier(), PyStringLiteralExpression.class);
if (pyString != null) {
return Pair.create(pyString, false);
python/testData/intentions/PyConvertToFStringIntentionTest/formatMethodWrongStringMethod.py
+1
View File
@@ -0,0 +1 @@
'no chunks inside'.up<caret>per()
python/testSrc/com/jetbrains/python/intentions/PyConvertToFStringIntentionTest.java
+4
View File
@@ -100,6 +100,10 @@ public class PyConvertToFStringIntentionTest extends PyIntentionTestCase {
doTest();
}
public void testFormatMethodWrongStringMethod() {
doNegativeTest();
}
public void testExtractItemAndAttributeAccess() {
assertSameElements(PyConvertToFStringIntention.extractItemsAndAttributes("{0.foo.bar.baz}"), ".foo", ".bar", ".baz");
assertSameElements(PyConvertToFStringIntention.extractItemsAndAttributes("{0[foo][.!:][}]}"), "[foo]", "[.!:]", "[}]");