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

Fixed error recovery after empty blocks with no indent

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2014-02-26 16:26:12 +04:00
parent 841e5c66d8
commit 09bd5b323a
4 changed files with 57 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/parsing/StatementParsing.java
+6 -5
View File
@@ -809,10 +809,8 @@ public class StatementParsing extends Parsing implements ITokenTypeRemapper {
myBuilder.advanceLexer();
final PsiBuilder.Marker marker = myBuilder.mark();
if (myBuilder.getTokenType() != PyTokenTypes.INDENT) {
myBuilder.error("Indent expected");
}
else {
final boolean indentFound = myBuilder.getTokenType() == PyTokenTypes.INDENT;
if (indentFound) {
myBuilder.advanceLexer();
if (myBuilder.eof()) {
myBuilder.error("Indented block expected");
@@ -823,13 +821,16 @@ public class StatementParsing extends Parsing implements ITokenTypeRemapper {
}
}
}
else {
myBuilder.error("Indent expected");
}
marker.done(PyElementTypes.STATEMENT_LIST);
marker.setCustomEdgeTokenBinders(LeadingCommentsBinder.INSTANCE, FollowingCommentBinder.INSTANCE);
if (endMarker != null) {
endMarker.done(elType);
}
if (!myBuilder.eof()) {
if (indentFound && !myBuilder.eof()) {
checkMatches(PyTokenTypes.DEDENT, "Dedent expected");
}
// NOTE: the following line advances the PsiBuilder lexer and thus
python/testData/psi/EmptyBlockInFunctionBeforeFunction.py
+6
View File
@@ -0,0 +1,6 @@
def foo(xs):
for x in xs:
def bar():
pass
python/testData/psi/EmptyBlockInFunctionBeforeFunction.txt
+41
View File
@@ -0,0 +1,41 @@
PyFile:EmptyBlockInFunctionBeforeFunction.py
PyFunction('foo')
PsiElement(Py:DEF_KEYWORD)('def')
PsiWhiteSpace(' ')
PsiElement(Py:IDENTIFIER)('foo')
PyParameterList
PsiElement(Py:LPAR)('(')
PyNamedParameter('xs')
PsiElement(Py:IDENTIFIER)('xs')
PsiElement(Py:RPAR)(')')
PsiElement(Py:COLON)(':')
PsiWhiteSpace('\n ')
PyStatementList
PyForStatement
PyForPart
PsiElement(Py:FOR_KEYWORD)('for')
PsiWhiteSpace(' ')
PyTargetExpression: x
PsiElement(Py:IDENTIFIER)('x')
PsiWhiteSpace(' ')
PsiElement(Py:IN_KEYWORD)('in')
PsiWhiteSpace(' ')
PyReferenceExpression: xs
PsiElement(Py:IDENTIFIER)('xs')
PsiElement(Py:COLON)(':')
PyStatementList
PsiErrorElement:Indent expected
<empty list>
PsiWhiteSpace('\n\n\n')
PyFunction('bar')
PsiElement(Py:DEF_KEYWORD)('def')
PsiWhiteSpace(' ')
PsiElement(Py:IDENTIFIER)('bar')
PyParameterList
PsiElement(Py:LPAR)('(')
PsiElement(Py:RPAR)(')')
PsiElement(Py:COLON)(':')
PsiWhiteSpace('\n ')
PyStatementList
PyPassStatement
PsiElement(Py:PASS_KEYWORD)('pass')
python/testSrc/com/jetbrains/python/PythonParsingTest.java
+4
View File
@@ -447,6 +447,10 @@ public class PythonParsingTest extends ParsingTestCase {
doTest(LanguageLevel.PYTHON33);
}
public void testEmptyBlockInFunctionBeforeFunction() {
doTest();
}
public void doTest(LanguageLevel languageLevel) {
LanguageLevel prev = myLanguageLevel;
myLanguageLevel = languageLevel;