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

correctly check for first missing comma in dict literal (PY-1025)

Browse Source
This commit is contained in:
Dmitry Jemerov
2010-05-31 20:22:54 +04:00
parent 0144adf7b3
commit e7b97de04c
4 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/parsing/ExpressionParsing.java
+5 -12
View File
@@ -151,8 +151,7 @@ public class ExpressionParsing extends Parsing {
final PsiBuilder.Marker expr = myBuilder.mark();
myBuilder.advanceLexer();
if (myBuilder.getTokenType() == PyTokenTypes.RBRACE) {
myBuilder.advanceLexer();
if (matchToken(PyTokenTypes.RBRACE)) {
expr.done(PyElementTypes.DICT_LITERAL_EXPRESSION);
return;
}
@@ -165,15 +164,14 @@ public class ExpressionParsing extends Parsing {
return;
}
if (myBuilder.getTokenType() == PyTokenTypes.COLON) {
myBuilder.advanceLexer();
if (matchToken(PyTokenTypes.COLON)) {
parseDictLiteralTail(expr, firstExprMarker);
}
else if (myBuilder.getTokenType() == PyTokenTypes.COMMA || myBuilder.getTokenType() == PyTokenTypes.RBRACE) {
else if (atToken(PyTokenTypes.COMMA) || atToken(PyTokenTypes.RBRACE)) {
firstExprMarker.drop();
parseSetLiteralTail(expr);
}
else if (myBuilder.getTokenType() == PyTokenTypes.FOR_KEYWORD) {
else if (atToken(PyTokenTypes.FOR_KEYWORD)) {
firstExprMarker.drop();
parseComprehension(expr, PyTokenTypes.RBRACE, PyElementTypes.SET_COMP_EXPRESSION);
}
@@ -196,16 +194,11 @@ public class ExpressionParsing extends Parsing {
parseComprehension(startMarker, PyTokenTypes.RBRACE, PyElementTypes.DICT_COMP_EXPRESSION);
}
else {
if (myBuilder.getTokenType() == PyTokenTypes.COMMA) {
myBuilder.advanceLexer();
}
while (myBuilder.getTokenType() != PyTokenTypes.RBRACE) {
checkMatches(PyTokenTypes.COMMA, message("PARSE.expected.comma"));
if (!parseKeyValueExpression()) {
break;
}
if (myBuilder.getTokenType() != PyTokenTypes.RBRACE) {
checkMatches(PyTokenTypes.COMMA, message("PARSE.expected.comma"));
}
}
myBuilder.advanceLexer();
startMarker.done(PyElementTypes.DICT_LITERAL_EXPRESSION);
python/testData/psi/DictMissingComma.py
+1
View File
@@ -0,0 +1 @@
d = {'key1':1 'key2':2}
python/testData/psi/DictMissingComma.txt
+25
View File
@@ -0,0 +1,25 @@
PyFile:DictMissingComma.py
PyAssignmentStatement
PyTargetExpression: d
PsiElement(Py:IDENTIFIER)('d')
PsiWhiteSpace(' ')
PsiElement(Py:EQ)('=')
PsiWhiteSpace(' ')
PyDictLiteralExpression
PsiElement(Py:LBRACE)('{')
PyKeyValueExpression
PyStringLiteralExpression: key1
PsiElement(Py:STRING_LITERAL)(''key1'')
PsiElement(Py:COLON)(':')
PyNumericLiteralExpression
PsiElement(Py:INTEGER_LITERAL)('1')
PsiErrorElement:',' expected
<empty list>
PsiWhiteSpace(' ')
PyKeyValueExpression
PyStringLiteralExpression: key2
PsiElement(Py:STRING_LITERAL)(''key2'')
PsiElement(Py:COLON)(':')
PyNumericLiteralExpression
PsiElement(Py:INTEGER_LITERAL)('2')
PsiElement(Py:RBRACE)('}')
python/testSrc/com/jetbrains/python/PythonParsingTest.java
+4
View File
@@ -202,6 +202,10 @@ public class PythonParsingTest extends ParsingTestCase {
doTest(LanguageLevel.PYTHON30);
}
public void testDictMissingComma() throws Exception { // PY-1025
doTest();
}
public void doTest() throws Exception {
doTest(LanguageLevel.PYTHON25);
}