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

Highlight bytes and non-bytes literals in Python 3+ (PY-32321)

Browse Source
This commit is contained in:
Semyon Proshev
2018-11-06 17:15:10 +03:00
parent da48486106
commit 7a0b54426e
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/validation/CompatibilityVisitor.java
+13
View File
@@ -216,10 +216,16 @@ public abstract class CompatibilityVisitor extends PyAnnotator {
public void visitPyStringLiteralExpression(final PyStringLiteralExpression node) {
super.visitPyStringLiteralExpression(node);
boolean seenBytes = false;
boolean seenNonBytes = false;
for (PyStringElement element : node.getStringElements()) {
final String prefix = element.getPrefix().toUpperCase();
if (prefix.isEmpty()) continue;
final boolean bytes = element.isBytes();
seenBytes |= bytes;
seenNonBytes |= !bytes;
final int elementStart = element.getTextOffset();
registerForAllMatchingVersions(level -> !getSupportedStringPrefixes(level).contains(prefix),
" not support a '" + prefix + "' prefix",
@@ -228,6 +234,13 @@ public abstract class CompatibilityVisitor extends PyAnnotator {
new RemovePrefixQuickFix(prefix),
true);
}
if (seenBytes && seenNonBytes) {
registerForAllMatchingVersions(LanguageLevel::isPy3K,
" not allow to mix bytes and non-bytes literals",
node,
null);
}
}
@NotNull
python/testData/highlighting/mixedBytesAndNonBytes.py
+3
View File
@@ -0,0 +1,3 @@
<error descr="Python version 3.6 does not allow to mix bytes and non-bytes literals">b'qwe'u'asd'</error>
<error descr="Python version 3.6 does not allow to mix bytes and non-bytes literals">b'qwe'r'asd'</error>
<error descr="Python version 3.6 does not allow to mix bytes and non-bytes literals">b'qwe'f'asd'</error>
python/testData/inspections/PyCompatibilityInspection/stringLiteralExpression.py
+4 -2
View File
@@ -45,8 +45,10 @@ a = u""
a = r""
a = <warning descr="Python version 3.4, 3.5, 3.6, 3.7 do not support a 'UR' prefix">ur</warning>""
# combined
b = u"" b""
# combined, PY-32321
b = <warning descr="Python version 3.4, 3.5, 3.6, 3.7 do not allow to mix bytes and non-bytes literals">u"" b""</warning>
b = <warning descr="Python version 3.4, 3.5, 3.6, 3.7 do not allow to mix bytes and non-bytes literals">r"" b""</warning>
b = <warning descr="Python version 3.4, 3.5, 3.6, 3.7 do not allow to mix bytes and non-bytes literals">f"" b""</warning>
# never was available
a = <error descr="Python version 2.7 does not support a 'RR' prefix"><warning descr="Python version 2.6, 2.7, 3.4, 3.5, 3.6, 3.7 do not support a 'RR' prefix">rr</warning></error>""
python/testSrc/com/jetbrains/python/PythonHighlightingTest.java
+5
View File
@@ -411,6 +411,11 @@ public class PythonHighlightingTest extends PyTestCase {
doTest(LanguageLevel.PYTHON36, false, false);
}
// PY-32321
public void testMixedBytesAndNonBytes() {
doTest(LanguageLevel.PYTHON36, false, false);
}
@NotNull
private static EditorColorsScheme createTemporaryColorScheme() {
EditorColorsManager manager = EditorColorsManager.getInstance();