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 PY-20752 'Replace with str.format method call' is messed up with tuples

Browse Source
This commit is contained in:
Valentina Kiryushkina
2016-09-28 14:36:08 +03:00
parent e9f97affb2
commit 2d68b1875b
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/intentions/ConvertFormatOperatorToMethodIntention.java
+9 -5
View File
@@ -34,10 +34,7 @@ import com.jetbrains.python.psi.*;
import com.jetbrains.python.psi.impl.PyBuiltinCache;
import com.jetbrains.python.psi.impl.PyPsiUtils;
import com.jetbrains.python.psi.impl.PyStringLiteralExpressionImpl;
import com.jetbrains.python.psi.types.PyClassType;
import com.jetbrains.python.psi.types.PyType;
import com.jetbrains.python.psi.types.PyTypeChecker;
import com.jetbrains.python.psi.types.TypeEvalContext;
import com.jetbrains.python.psi.types.*;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
@@ -272,7 +269,9 @@ public class ConvertFormatOperatorToMethodIntention extends BaseIntentionAction
final String separator = getSeparator(leftExpression);
target.append(separator).append(".format");
if (rhs instanceof PyDictLiteralExpression) target.append("(**").append(paramText).append(")");
if (rhs instanceof PyReferenceExpression && rhsType instanceof PyTupleType) {
target.append("(*").append(paramText).append(")");
}
else if (rhs instanceof PyCallExpression) { // potential dict(foo=1) -> format(foo=1)
final PyCallExpression callExpression = (PyCallExpression)rhs;
final PyExpression callee = callExpression.getCallee();
@@ -294,6 +293,11 @@ public class ConvertFormatOperatorToMethodIntention extends BaseIntentionAction
}
}
}
else if (rhsType instanceof PyCollectionType) {
if ("dict".equals(rhsType.getName())) {
target.append("(**").append(paramText).append(")");
}
}
else target.append("(").append(paramText).append(")"); // tuple is ok as is
// Correctly handle multiline implicitly concatenated string literals (PY-9176)
target.insert(0, '(').append(')');