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

Merge remote branch 'origin/master'

Browse Source 
Conflicts:
	python/testData/psi/ColonBeforeEof.txt
This commit is contained in:
Ekaterina Tuzova
2011-12-15 13:10:44 +04:00
parent a1e5d2ea44 7df9c94cf0
commit a89dd1b950
78 changed files with 1238 additions and 1209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/testData/psi/IncompleteFor.txt
+1 -1
View File
@@ -20,7 +20,7 @@ PyFile:IncompleteFor.py
PsiWhiteSpace(' ')
PyReferenceExpression: ba
PsiElement(Py:IDENTIFIER)('ba')
PsiErrorElement:colon expected
PsiErrorElement:Colon expected
<empty list>
PyStatementList
<empty list>
python/testData/psi/IncompleteStatementList.txt
+1 -1
View File
@@ -15,7 +15,7 @@ PyFile:IncompleteStatementList.py
PsiWhiteSpace(' ')
PyReferenceExpression: ba
PsiElement(Py:IDENTIFIER)('ba')
PsiErrorElement:colon expected
PsiErrorElement:Colon expected
<empty list>
PyStatementList
<empty list>
python/testData/psi/InconsistentDedent.txt
+1 -1
View File
@@ -11,7 +11,7 @@ PyFile:InconsistentDedent.py
PyStatementList
PyPassStatement
PsiElement(Py:PASS_KEYWORD)('pass')
PsiErrorElement:unindent does not match any outer indentation level
PsiErrorElement:Unindent does not match any outer indentation level
<empty list>
PsiWhiteSpace('\n ')
PyPrintStatement
python/testData/psi/MissingParenInCall.txt
+1 -1
View File
@@ -26,7 +26,7 @@ PyFile:MissingParenInCall.py
PsiElement(Py:COMMA)(',')
PsiErrorElement:expression expected
<empty list>
PsiErrorElement:colon expected
PsiErrorElement:Colon expected
<empty list>
PsiWhiteSpace('\n\n')
PyStatementList
python/testData/psi/WithStatement2.txt
+2 -2
View File
@@ -72,12 +72,12 @@ PyFile:WithStatement2.py
PyWithItem
PsiErrorElement:expression expected
<empty list>
PsiErrorElement:colon expected
PsiErrorElement:Colon expected
<empty list>
PyStatementList
<empty list>
PsiElement(Py:EQ)('=')
PsiErrorElement:statement expected, found Py:EQ
PsiErrorElement:Statement expected, found Py:EQ
<empty list>
PsiWhiteSpace(' ')
PyExpressionStatement