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

fix parsing of character classes so that it's actually correct (PY-1929)

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-02-21 19:09:58 +01:00
parent 1e821e1216
commit aefabe0d79
4 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/python.iml
+1 -1
View File
@@ -23,7 +23,7 @@
<orderEntry type="library" name="xpp3-1.1.4-min" level="project" />
<orderEntry type="module" module-name="xml" />
<orderEntry type="module" module-name="xdebugger-api" />
<orderEntry type="module" module-name="RegExpSupport" />
<orderEntry type="module" module-name="RegExpSupport" exported="" />
<orderEntry type="module" module-name="yaml" />
<orderEntry type="library" name="microba" level="project" />
<orderEntry type="library" name="XmlRPC" level="project" />
python/testData/regexp/braceInPythonCharacterClass.py
+3
View File
@@ -0,0 +1,3 @@
import re
EXTRANEOUS_WHITESPACE_REGEX = re.compile(r'[[({] | []}),;:]')
python/testSrc/com/jetbrains/python/PyRegexpTest.java
+12
View File
@@ -1,5 +1,8 @@
package com.jetbrains.python;
import com.intellij.lexer.Lexer;
import com.jetbrains.python.codeInsight.regexp.PythonRegexpParserDefinition;
import com.jetbrains.python.fixtures.PyLexerTestCase;
import com.jetbrains.python.fixtures.PyLightFixtureTestCase;
/**
@@ -10,6 +13,11 @@ public class PyRegexpTest extends PyLightFixtureTestCase {
doTest();
}
public void testNestedCharacterClassesLexer() {
Lexer lexer = new PythonRegexpParserDefinition().createLexer(myFixture.getProject());
PyLexerTestCase.doLexerTest("[][]", lexer, "CLASS_BEGIN", "CHARACTER", "CHARACTER", "CLASS_END");
}
public void testNestedCharacterClasses2() { // PY-2908
doTest();
}
@@ -18,6 +26,10 @@ public class PyRegexpTest extends PyLightFixtureTestCase {
doTest();
}
public void testBraceInPythonCharacterClass() { // PY-1929
doTest();
}
private void doTest() {
myFixture.testHighlighting(true, false, false, "regexp/" + getTestName(true) + ".py");
}
python/testSrc/com/jetbrains/python/fixtures/PyLexerTestCase.java
+1 -1
View File
@@ -7,7 +7,7 @@ import junit.framework.TestCase;
* @author yole
*/
public abstract class PyLexerTestCase extends TestCase {
protected static void doLexerTest(String text, Lexer lexer, String... expectedTokens) {
public static void doLexerTest(String text, Lexer lexer, String... expectedTokens) {
lexer.start(text);
int idx = 0;
int tokenPos = 0;