azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wrap user types into JetTypeElements + Support nullable types

Browse Source
This commit is contained in:
Andrey Breslav
2011-01-24 16:05:24 +03:00
parent 113a066e48
commit 23fec0f24c
81 changed files with 4376 additions and 3212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/psi/examples/priorityqueues/BinaryHeap.txt
+140 -104
View File
@@ -15,14 +15,16 @@ JetFile: BinaryHeap.jet
DELEGATION_SPECIFIER_LIST
DELEGATOR_SUPER_CLASS
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('IPriorityQueue')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('IPriorityQueue')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
@@ -38,14 +40,16 @@ JetFile: BinaryHeap.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('IMutableList')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('IMutableList')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
PsiWhiteSpace('\n ')
PROPERTY
MODIFIER_LIST
@@ -58,14 +62,16 @@ JetFile: BinaryHeap.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Comparison')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Comparison')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
PsiWhiteSpace('\n\n ')
CONSTRUCTOR
PsiElement(this)('this')
@@ -77,14 +83,16 @@ JetFile: BinaryHeap.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('IIterable')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('IIterable')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
VALUE_PARAMETER
@@ -93,14 +101,16 @@ JetFile: BinaryHeap.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Comparison')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Comparison')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
@@ -110,8 +120,9 @@ JetFile: BinaryHeap.jet
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
@@ -214,14 +225,16 @@ JetFile: BinaryHeap.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Comparison')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Comparison')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
@@ -303,8 +316,9 @@ JetFile: BinaryHeap.jet
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
@@ -324,8 +338,9 @@ JetFile: BinaryHeap.jet
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
@@ -346,8 +361,9 @@ JetFile: BinaryHeap.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiWhiteSpace(' ')
BLOCK
PsiElement(LBRACE)('{')
@@ -446,8 +462,9 @@ JetFile: BinaryHeap.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
@@ -500,8 +517,9 @@ JetFile: BinaryHeap.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
@@ -725,8 +743,9 @@ JetFile: BinaryHeap.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
@@ -870,8 +889,9 @@ JetFile: BinaryHeap.jet
PsiElement(for)('for')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
@@ -884,8 +904,9 @@ JetFile: BinaryHeap.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiWhiteSpace('\n ')
PROPERTY_ACCESSOR
PsiElement(get)('get')
@@ -920,8 +941,9 @@ JetFile: BinaryHeap.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiWhiteSpace('\n ')
PROPERTY_ACCESSOR
PsiElement(get)('get')
@@ -953,8 +975,9 @@ JetFile: BinaryHeap.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiWhiteSpace('\n ')
PROPERTY_ACCESSOR
PsiElement(get)('get')
@@ -986,8 +1009,9 @@ JetFile: BinaryHeap.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
@@ -1047,8 +1071,9 @@ JetFile: BinaryHeap.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Boolean')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Boolean')
PsiWhiteSpace('\n ')
PROPERTY_ACCESSOR
PsiElement(get)('get')
@@ -1101,8 +1126,9 @@ JetFile: BinaryHeap.jet
PsiElement(for)('for')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
@@ -1113,8 +1139,9 @@ JetFile: BinaryHeap.jet
PsiElement(LBRACKET)('[')
ATTRIBUTE
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('operator')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('operator')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
PsiElement(fun)('fun')
@@ -1130,15 +1157,17 @@ JetFile: BinaryHeap.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
@@ -1165,14 +1194,16 @@ JetFile: BinaryHeap.jet
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('IMutableList')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('IMutableList')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('swap')
TYPE_PARAMETER_LIST
@@ -1185,8 +1216,9 @@ JetFile: BinaryHeap.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
VALUE_PARAMETER
@@ -1195,8 +1227,9 @@ JetFile: BinaryHeap.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
@@ -1260,22 +1293,25 @@ JetFile: BinaryHeap.jet
PsiElement(val)('val')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('IList')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('IList')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('lastIndex')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiWhiteSpace('\n ')
PROPERTY_ACCESSOR
PsiElement(get)('get')
idea/testData/psi/examples/priorityqueues/IPriorityQueue.txt
+9 -6
View File
@@ -29,8 +29,9 @@ JetFile: IPriorityQueue.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiWhiteSpace('\n ')
FUN
PsiElement(fun)('fun')
@@ -46,8 +47,9 @@ JetFile: IPriorityQueue.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
PROPERTY
@@ -58,7 +60,8 @@ JetFile: IPriorityQueue.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Boolean')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Boolean')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt
+23 -18
View File
@@ -19,14 +19,16 @@ JetFile: PriorityQueueAsPushPop.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('IPriorityQueue')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('IPriorityQueue')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
@@ -34,14 +36,16 @@ JetFile: PriorityQueueAsPushPop.jet
DELEGATION_SPECIFIER_LIST
DELEGATOR_SUPER_CLASS
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('IPushPop')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('IPushPop')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
@@ -89,8 +93,9 @@ JetFile: PriorityQueueAsPushPop.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')