MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

tweak lambda parsing: don't put colon inside parameter list (for consistency with regular functions)

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-08-26 16:27:47 +02:00
parent 5d902df418
commit c5142c94b0
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
python/src/com/jetbrains/python/parsing/FunctionParsing.java
View File

@@ -173,11 +173,15 @@ public class FunctionParsing extends Parsing {
}
}
if (myBuilder.getTokenType() == endToken) {
if (myBuilder.getTokenType() == endToken && endToken == PyTokenTypes.RPAR) {
myBuilder.advanceLexer();
}
parameterList.done(PyElementTypes.PARAMETER_LIST);
if (myBuilder.getTokenType() == endToken && endToken == PyTokenTypes.COLON) {
myBuilder.advanceLexer();
}
}
private void parseParameterSubList() {

2
python/testData/psi/ConditionalParenLambda.txt
View File

@@ -25,7 +25,7 @@ PyFile:ConditionalParenLambda.py
PyParameterList
PyNamedParameter('x')
PsiElement(Py:IDENTIFIER)('x')
PsiElement(Py:COLON)(':')
PsiElement(Py:COLON)(':')
PsiWhiteSpace(' ')
PyConditionalExpression
PyReferenceExpression: x

6
python/testData/psi/LambdaComprehension.txt
View File

@@ -16,7 +16,8 @@ PyFile:LambdaComprehension.py
PyLambdaExpression
PsiElement(Py:LAMBDA_KEYWORD)('lambda')
PyParameterList
PsiElement(Py:COLON)(':')
<empty list>
PsiElement(Py:COLON)(':')
PsiWhiteSpace(' ')
PyReferenceExpression: True
PsiElement(Py:IDENTIFIER)('True')
@@ -25,7 +26,8 @@ PyFile:LambdaComprehension.py
PyLambdaExpression
PsiElement(Py:LAMBDA_KEYWORD)('lambda')
PyParameterList
PsiElement(Py:COLON)(':')
<empty list>
PsiElement(Py:COLON)(':')
PsiWhiteSpace(' ')
PyReferenceExpression: False
PsiElement(Py:IDENTIFIER)('False')

2
python/testData/psi/LambdaConditional.txt
View File

@@ -6,7 +6,7 @@ PyFile:LambdaConditional.py
PyParameterList
PyNamedParameter('x')
PsiElement(Py:IDENTIFIER)('x')
PsiElement(Py:COLON)(':')
PsiElement(Py:COLON)(':')
PsiWhiteSpace(' ')
PyConditionalExpression
PyNumericLiteralExpression