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-10843 Converting from concatenation to str.format intention does not work in PyCharm

Browse Source
This commit is contained in:
Ekaterina Tuzova
2013-09-20 13:43:55 +04:00
parent 398c5b19b2
commit 2e6bf2bdea
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/intentions/PyStringConcatenationToFormatIntention.java
+5 -4
View File
@@ -109,9 +109,10 @@ public class PyStringConcatenationToFormatIntention extends BaseIntentionAction
public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
PsiElement element = PsiTreeUtil.getParentOfType(file.findElementAt(editor.getCaretModel().getOffset()), PyBinaryExpression.class, false);
while (element.getParent() instanceof PyBinaryExpression) {
while (element != null && element.getParent() instanceof PyBinaryExpression) {
element = element.getParent();
}
if (element == null) return;
final LanguageLevel languageLevel = LanguageLevel.forElement(element);
final boolean useFormatMethod = languageLevel.isAtLeast(LanguageLevel.PYTHON27);
@@ -133,7 +134,7 @@ public class PyStringConcatenationToFormatIntention extends BaseIntentionAction
}
stringLiteral.append(escaper.fun(value));
} else {
addParamToString(stringLiteral, paramCount, languageLevel);
addParamToString(stringLiteral, paramCount, useFormatMethod);
parameters.add(expression.getText());
++paramCount;
}
@@ -166,8 +167,8 @@ public class PyStringConcatenationToFormatIntention extends BaseIntentionAction
}
}
private static void addParamToString(StringBuilder stringLiteral, int i, LanguageLevel level) {
if (level.isPy3K())
private static void addParamToString(StringBuilder stringLiteral, int i, boolean useFormatMethod) {
if (useFormatMethod)
stringLiteral.append("{").append(i).append("}");
else
stringLiteral.append("%s");