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

change parsing of generator in argument list so that parentheses are part of argument list, not generator (PY-3172)

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-03-23 20:28:13 +01:00
parent 971d0aa1c3
commit db5297d5e1
7 changed files with 62 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/parsing/ExpressionParsing.java
+16 -10
View File
@@ -99,7 +99,7 @@ public class ExpressionParsing extends Parsing {
builder.error(message("PARSE.expected.expression"));
}
if (builder.getTokenType() == PyTokenTypes.FOR_KEYWORD) {
parseComprehension(expr, PyTokenTypes.RBRACKET, PyElementTypes.LIST_COMP_EXPRESSION);
parseComprehension(expr, PyTokenTypes.RBRACKET, PyElementTypes.LIST_COMP_EXPRESSION, false);
}
else {
while (builder.getTokenType() != PyTokenTypes.RBRACKET) {
@@ -120,8 +120,9 @@ public class ExpressionParsing extends Parsing {
}
private void parseComprehension(PsiBuilder.Marker expr,
final IElementType endToken,
final IElementType exprType) {
final IElementType endToken,
final IElementType exprType,
final boolean leaveEndTokenOutside) {
assertCurrentToken(PyTokenTypes.FOR_KEYWORD);
while (true) {
myBuilder.advanceLexer();
@@ -134,8 +135,13 @@ public class ExpressionParsing extends Parsing {
myBuilder.advanceLexer();
parseOldExpression();
}
if (myBuilder.getTokenType() == endToken) {
myBuilder.advanceLexer();
if (atToken(endToken)) {
if (leaveEndTokenOutside) {
expr.done(exprType);
nextToken();
return;
}
nextToken();
break;
}
if (myBuilder.getTokenType() == PyTokenTypes.FOR_KEYWORD) {
@@ -176,7 +182,7 @@ public class ExpressionParsing extends Parsing {
}
else if (atToken(PyTokenTypes.FOR_KEYWORD)) {
firstExprMarker.drop();
parseComprehension(expr, PyTokenTypes.RBRACE, PyElementTypes.SET_COMP_EXPRESSION);
parseComprehension(expr, PyTokenTypes.RBRACE, PyElementTypes.SET_COMP_EXPRESSION, false);
}
else {
myBuilder.error("expression expected");
@@ -197,7 +203,7 @@ public class ExpressionParsing extends Parsing {
}
firstKeyValueMarker.done(PyElementTypes.KEY_VALUE_EXPRESSION);
if (myBuilder.getTokenType() == PyTokenTypes.FOR_KEYWORD) {
parseComprehension(startMarker, PyTokenTypes.RBRACE, PyElementTypes.DICT_COMP_EXPRESSION);
parseComprehension(startMarker, PyTokenTypes.RBRACE, PyElementTypes.DICT_COMP_EXPRESSION, false);
}
else {
while (myBuilder.getTokenType() != PyTokenTypes.RBRACE) {
@@ -249,7 +255,7 @@ public class ExpressionParsing extends Parsing {
else {
parseYieldOrTupleExpression(isTargetExpression);
if (myBuilder.getTokenType() == PyTokenTypes.FOR_KEYWORD) {
parseComprehension(expr, PyTokenTypes.RPAR, PyElementTypes.GENERATOR_EXPRESSION);
parseComprehension(expr, PyTokenTypes.RPAR, PyElementTypes.GENERATOR_EXPRESSION, false);
}
else {
checkMatches(PyTokenTypes.RPAR, message("PARSE.expected.rpar"));
@@ -409,15 +415,15 @@ public class ExpressionParsing extends Parsing {
public void parseArgumentList() {
LOG.assertTrue(myBuilder.getTokenType() == PyTokenTypes.LPAR);
final PsiBuilder.Marker arglist = myBuilder.mark();
final PsiBuilder.Marker genexpr = myBuilder.mark();
myBuilder.advanceLexer();
final PsiBuilder.Marker genexpr = myBuilder.mark();
int argNumber = 0;
boolean needBracket = true;
while (myBuilder.getTokenType() != PyTokenTypes.RPAR) {
argNumber++;
if (argNumber > 1) {
if (argNumber == 2 && myBuilder.getTokenType() == PyTokenTypes.FOR_KEYWORD && genexpr != null) {
parseComprehension(genexpr, PyTokenTypes.RPAR, PyElementTypes.GENERATOR_EXPRESSION);
parseComprehension(genexpr, PyTokenTypes.RPAR, PyElementTypes.GENERATOR_EXPRESSION, true);
needBracket = false;
break;
}
python/testData/formatter/noWrapBeforeParen.py
+6
View File
@@ -0,0 +1,6 @@
def foo():
def bar():
def baz():
if comments:
for comment in comments:
record += ' <comment ' + "".join(ca + '=' + quoteattr(comment[ca]) + ' ' for ca in comment) + '/>\n'
python/testData/formatter/noWrapBeforeParen_after.py
+7
View File
@@ -0,0 +1,7 @@
def foo():
def bar():
def baz():
if comments:
for comment in comments:
record += ' <comment ' + "".join(
ca + '=' + quoteattr(comment[ca]) + ' ' for ca in comment) + '/>\n'
python/testData/psi/GeneratorInArgumentList.py
+1
View File
@@ -0,0 +1 @@
"".join(' ' for ca in comment)
python/testData/psi/GeneratorInArgumentList.txt
+24
View File
@@ -0,0 +1,24 @@
PyFile:GeneratorInArgumentList.py
PyExpressionStatement
PyCallExpression: "".join
PyReferenceExpression: join
PyStringLiteralExpression:
PsiElement(Py:STRING_LITERAL)('""')
PsiElement(Py:DOT)('.')
PsiElement(Py:IDENTIFIER)('join')
PyArgumentList
PsiElement(Py:LPAR)('(')
PyGeneratorExpression
PyStringLiteralExpression:
PsiElement(Py:STRING_LITERAL)('' '')
PsiWhiteSpace(' ')
PsiElement(Py:FOR_KEYWORD)('for')
PsiWhiteSpace(' ')
PyTargetExpression: ca
PsiElement(Py:IDENTIFIER)('ca')
PsiWhiteSpace(' ')
PsiElement(Py:IN_KEYWORD)('in')
PsiWhiteSpace(' ')
PyReferenceExpression: comment
PsiElement(Py:IDENTIFIER)('comment')
PsiElement(Py:RPAR)(')')
python/testSrc/com/jetbrains/python/PyFormatterTest.java
+4
View File
@@ -104,6 +104,10 @@ public class PyFormatterTest extends PyLightFixtureTestCase {
doTest();
}
public void testNoWrapBeforeParen() { // PY-3172
doTest();
}
private void doTest() {
myFixture.configureByFile("formatter/" + getTestName(true) + ".py");
ApplicationManager.getApplication().runWriteAction(new Runnable() {
python/testSrc/com/jetbrains/python/PythonParsingTest.java
+4
View File
@@ -255,6 +255,10 @@ public class PythonParsingTest extends ParsingTestCase {
doTest();
}
public void testGeneratorInArgumentList() { // PY-3172
doTest();
}
public void doTest() {
doTest(LanguageLevel.PYTHON25);
}