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

escaping single quotes is not redundant in PyCharm (PY-5030)

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-11-15 19:00:49 +01:00
parent 3fcac94c36
commit 5d992e3b22
3 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/impl/PyStringLiteralExpressionImpl.java
+19 -23
View File
@@ -181,34 +181,30 @@ public class PyStringLiteralExpressionImpl extends PyElementImpl implements PySt
String octal = escMatcher.group(2);
String hex = escMatcher.group(3);
String str = null;
if (!raw) {
if (octal != null) {
str = new String(new char[]{(char)Integer.parseInt(octal, 8)});
if (octal != null) {
str = new String(new char[]{(char)Integer.parseInt(octal, 8)});
}
else if (hex != null) {
str = new String(new char[]{(char)Integer.parseInt(hex, 16)});
}
else if (hex != null) {
str = new String(new char[]{(char)Integer.parseInt(hex, 16)});
}
else {
String toReplace = escMatcher.group(1);
String replacement = escapeMap.get(toReplace);
if (replacement != null) {
str = replacement;
}
}
else {
String toReplace = escMatcher.group(1);
String replacement = escapeMap.get(toReplace);
if (replacement != null) {
str = replacement;
}
}
if (unicode) {
if (!raw) {
String unicodeName = escMatcher.group(4);
String unicode32 = escMatcher.group(6);
String unicodeName = escMatcher.group(4);
String unicode32 = escMatcher.group(6);
if (unicode32 != null) {
str = new String(Character.toChars((int)Long.parseLong(unicode32, 16)));
}
if (unicodeName != null) {
//TOLATER: implement unicode character name escapes
}
if (unicode32 != null) {
str = new String(Character.toChars((int)Long.parseLong(unicode32, 16)));
}
if (unicodeName != null) {
//TOLATER: implement unicode character name escapes
}
String unicode16 = escMatcher.group(5);
if (unicode16 != null) {
@@ -372,7 +368,7 @@ public class PyStringLiteralExpressionImpl extends PyElementImpl implements PySt
}
public boolean characterNeedsEscaping(char c) {
return c == ']' || c == '}' || c == '\"';
return c == ']' || c == '}' || c == '\"' || c == '\'';
}
public boolean supportsPerl5EmbeddedComments() {
python/testData/regexp/redundantEscapeSingleQuote.py
+3
View File
@@ -0,0 +1,3 @@
import re
foo = re.compile(r'[\w\']')
python/testSrc/com/jetbrains/python/PyRegexpTest.java
+5 -1
View File
@@ -43,8 +43,12 @@ public class PyRegexpTest extends PyTestCase {
PyLexerTestCase.doLexerTest("# abc", lexer, "COMMENT", "COMMENT");
}
public void testRedundantEscapeSingleQuote() { // PY-5027
doTestHighlighting();
}
private void doTestHighlighting() {
myFixture.testHighlighting(true, false, false, "regexp/" + getTestName(true) + ".py");
myFixture.testHighlighting(true, false, true, "regexp/" + getTestName(true) + ".py");
}
private void doTestLexer(final String text, String... expectedTokens) {