MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-20775 Report missing closing brace for expression parts inside f-strings

Browse Source 
Also fixed detection of closing brace after conversion characters and
format specifiers inside expression parts.
This commit is contained in:
Mikhail Golubev
2016-09-21 20:42:36 +03:00
parent 7f134f8908
commit 6ec6eccb64
5 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
python/src/com/jetbrains/python/codeInsight/fstrings/FStringParser.java
View File

@@ -120,12 +120,19 @@ public class FStringParser {
contentEndOffset = offset;
if (c1 == '}') {
rightBraceOffset = offset;
offset++;
break;
}
}
}
else if (c1 == '{') {
offset = parseFragment(offset, depth + 1);
continue;
}
else if (c1 == '}') {
rightBraceOffset = offset;
offset++;
break;
}
offset++;
}

10
python/src/com/jetbrains/python/validation/FStringsAnnotator.java
View File

@@ -33,13 +33,21 @@ public class FStringsAnnotator extends PyAnnotator {
@Override
public void visitPyStringLiteralExpression(PyStringLiteralExpression pyString) {
for (ASTNode node : pyString.getStringNodes()) {
if (new StringNodeInfo(node).isFormatted()) {
final StringNodeInfo nodeInfo = new StringNodeInfo(node);
if (nodeInfo.isFormatted()) {
final int nodeOffset = node.getTextRange().getStartOffset();
final List<FragmentOffsets> fragments = FStringParser.parse(node.getText());
boolean hasUnclosedBrace = false;
for (FragmentOffsets fragment : fragments) {
if (fragment.getLeftBraceOffset() + 1 >= fragment.getContentEndOffset()) {
report(fragment.getContentRange().shiftRight(nodeOffset), "Empty expressions are not allowed inside f-strings");
}
if (fragment.getRightBraceOffset() == -1) {
hasUnclosedBrace = true;
}
}
if (hasUnclosedBrace) {
report(TextRange.from(nodeInfo.getContentRange().getEndOffset(), 0).shiftRight(nodeOffset), "'}' is expected");
}
}
}

4
python/testData/highlighting/fStringEmptyExpressions.py
View File

@@ -1,6 +1,6 @@
f'{<error descr="Empty expressions are not allowed inside f-strings"></error>}'
f'{<error descr="Empty expressions are not allowed inside f-strings"></error>'
<error descr="Missing closing quote [']">f'{<error descr="Empty expressions are not allowed inside f-strings"></error></error>
f'{<error descr="Empty expressions are not allowed inside f-strings"></error><error descr="'}' is expected"></error>'
<error descr="Missing closing quote [']">f'{<error descr="Empty expressions are not allowed inside f-strings"></error><error descr="'}' is expected"></error></error>
f'{<error descr="Empty expressions are not allowed inside f-strings"></error>!r}'
f'{<error descr="Empty expressions are not allowed inside f-strings"></error>:2.3}'
f'{42:2.{<error descr="Empty expressions are not allowed inside f-strings"></error>}}'

10
python/testData/highlighting/fStringMissingRightBrace.py Normal file
View File

@@ -0,0 +1,10 @@
f'{42}'
f'{42!r}'
f'{42!r:03}'
f'{42:03}'
f'{42!r:{y}.{z}}'
f'{<error descr="Empty expressions are not allowed inside f-strings"></error><error descr="'}' is expected"></error>'
f'{42:{<error descr="Empty expressions are not allowed inside f-strings"></error><error descr="'}' is expected"></error>'
f'{42!r:{<error descr="Empty expressions are not allowed inside f-strings"></error><error descr="'}' is expected"></error>'
f'{{'
f'{{{<error descr="Empty expressions are not allowed inside f-strings"></error><error descr="'}' is expected"></error>'

5
python/testSrc/com/jetbrains/python/PythonHighlightingTest.java
View File

@@ -305,6 +305,11 @@ public class PythonHighlightingTest extends PyTestCase {
doTest();
}
// PY-20775
public void testFStringMissingRightBrace() {
runWithLanguageLevel(LanguageLevel.PYTHON36, () -> doTest(true, false));
}
// PY-20776
public void testFStringEmptyExpressions() {
runWithLanguageLevel(LanguageLevel.PYTHON36, () -> doTest(true, false));