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-24610 Exception because of Invalid TextRange in format string: use PyStringLiteralExpression#getText() instead of PyStringLiteralExpression#getStringValue()

Browse Source
This commit is contained in:
Valentina Kiryushkina
2017-06-07 19:58:25 +03:00
parent 45829836d6
commit 00d44b070b
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/completion/PyStringFormatCompletionContributor.java
+2 -2
View File
@@ -197,13 +197,13 @@ public class PyStringFormatCompletionContributor extends CompletionContributor {
@NotNull
private static List<LookupElement> getFormatLookupBuilders(@NotNull final PyStringLiteralExpression expression) {
final Map<String, PyStringFormatParser.SubstitutionChunk> chunks = PyStringFormatParser.getKeywordSubstitutions(
PyStringFormatParser.filterSubstitutions(PyStringFormatParser.parseNewStyleFormat(expression.getStringValue())));
PyStringFormatParser.filterSubstitutions(PyStringFormatParser.parseNewStyleFormat(expression.getText())));
return getLookupBuilders(chunks);
}
private static List<LookupElement> getPercentLookupBuilders(@NotNull final PyStringLiteralExpression expression) {
final Map<String, PyStringFormatParser.SubstitutionChunk> chunks = PyStringFormatParser.getKeywordSubstitutions(
PyStringFormatParser.filterSubstitutions(PyStringFormatParser.parsePercentFormat(expression.getStringValue())));
PyStringFormatParser.filterSubstitutions(PyStringFormatParser.parsePercentFormat(expression.getText())));
return getLookupBuilders(chunks);
}
python/src/com/jetbrains/python/inspections/PyStringFormatInspection.java
+2 -2
View File
@@ -346,7 +346,7 @@ public class PyStringFormatInspection extends PyInspection {
}
private void inspectPercentFormat(@NotNull final PyStringLiteralExpression formatExpression) {
final String value = formatExpression.getStringValue();
final String value = formatExpression.getText();
final List<PyStringFormatParser.SubstitutionChunk> chunks = filterSubstitutions(parsePercentFormat(value));
myExpectedArguments = chunks.size();
@@ -482,7 +482,7 @@ public class PyStringFormatInspection extends PyInspection {
}
public void inspect() {
final String value = myFormatExpression.getStringValue();
final String value = myFormatExpression.getText();
final List<PyStringFormatParser.SubstitutionChunk> chunks = filterSubstitutions(PyStringFormatParser.parseNewStyleFormat(value));
for (int i = 0; i < chunks.size(); i++) {
python/testData/inspections/PyStringFormatInspection/EscapedString.py
+2
View File
@@ -0,0 +1,2 @@
u"{key}".format(key=1)
<warning descr="Key 'k' has no corresponding argument">u"{k}"</warning>.format(key=1)
python/testSrc/com/jetbrains/python/inspections/PyStringFormatInspectionTest.java
+4
View File
@@ -193,6 +193,10 @@ public class PyStringFormatInspectionTest extends PyTestCase {
doTest();
}
public void testEscapedString() {
doTest();
}
//PY-21166
public void testUnsupportedFormatSpecifierNewStyleFormatting() {
doTest();