Wrap user types into JetTypeElements + Support nullable types

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
+51 -34
View File
@@ -15,8 +15,9 @@ JetFile: ControlStructures.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
@@ -27,8 +28,9 @@ JetFile: ControlStructures.jet
PsiElement(new)('new')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Foo')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Foo')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
VALUE_PARAMETER
@@ -37,8 +39,9 @@ JetFile: ControlStructures.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
@@ -55,8 +58,9 @@ JetFile: ControlStructures.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
@@ -70,8 +74,9 @@ JetFile: ControlStructures.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
@@ -87,8 +92,9 @@ JetFile: ControlStructures.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
@@ -102,8 +108,9 @@ JetFile: ControlStructures.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
@@ -119,8 +126,9 @@ JetFile: ControlStructures.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
@@ -150,8 +158,9 @@ JetFile: ControlStructures.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
@@ -277,8 +286,9 @@ JetFile: ControlStructures.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Bar')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Bar')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
@@ -305,8 +315,9 @@ JetFile: ControlStructures.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Bar')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Bar')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
@@ -325,8 +336,9 @@ JetFile: ControlStructures.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Bar')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Bar')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
@@ -345,8 +357,9 @@ JetFile: ControlStructures.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Bar')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Bar')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
@@ -373,8 +386,9 @@ JetFile: ControlStructures.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Bar')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Bar')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
@@ -393,8 +407,9 @@ JetFile: ControlStructures.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Bar')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Bar')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
@@ -476,8 +491,9 @@ JetFile: ControlStructures.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiWhiteSpace(' ')
PsiElement(in)('in')
PsiWhiteSpace(' ')
@@ -500,8 +516,9 @@ JetFile: ControlStructures.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiWhiteSpace(' ')
PsiElement(in)('in')
PsiWhiteSpace(' ')