diff --git a/idea/testData/psi/SimpleExpressions.jet b/idea/testData/psi/SimpleExpressions.jet index aea3b5dbbdc..458cbbab1b5 100644 --- a/idea/testData/psi/SimpleExpressions.jet +++ b/idea/testData/psi/SimpleExpressions.jet @@ -17,13 +17,6 @@ fun a( a : foo = this, a : foo = (10), a : foo = (10, "A", 0xf), - a : foo = [:], - a : foo = [a:b], - a : foo = [a:b,d:c], - a : foo = [a,b,d,c], - a : foo = [], - a : foo = [10], - a : foo = [10..5], a : foo = typeof(10), a : foo = new Foo(bar), a : foo = new Foo(bar), diff --git a/idea/testData/psi/SimpleExpressions.txt b/idea/testData/psi/SimpleExpressions.txt index 4368ebfb414..eb825c357fe 100644 --- a/idea/testData/psi/SimpleExpressions.txt +++ b/idea/testData/psi/SimpleExpressions.txt @@ -282,146 +282,6 @@ JetFile: SimpleExpressions.jet PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') - VALUE_PARAMETER - PsiElement(IDENTIFIER)('a') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiWhiteSpace(' ') - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - MAP_LITERAL - PsiElement(LBRACKET)('[') - PsiElement(COLON)(':') - PsiElement(RBRACKET)(']') - PsiElement(COMMA)(',') - PsiWhiteSpace('\n ') - VALUE_PARAMETER - PsiElement(IDENTIFIER)('a') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiWhiteSpace(' ') - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - MAP_LITERAL - PsiElement(LBRACKET)('[') - MAP_LITERAL_ENTRY - PsiElement(IDENTIFIER)('a') - PsiElement(COLON)(':') - PsiElement(IDENTIFIER)('b') - PsiElement(RBRACKET)(']') - PsiElement(COMMA)(',') - PsiWhiteSpace('\n ') - VALUE_PARAMETER - PsiElement(IDENTIFIER)('a') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiWhiteSpace(' ') - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - MAP_LITERAL - PsiElement(LBRACKET)('[') - MAP_LITERAL_ENTRY - PsiElement(IDENTIFIER)('a') - PsiElement(COLON)(':') - PsiElement(IDENTIFIER)('b') - PsiElement(COMMA)(',') - MAP_LITERAL_ENTRY - PsiElement(IDENTIFIER)('d') - PsiElement(COLON)(':') - PsiElement(IDENTIFIER)('c') - PsiElement(RBRACKET)(']') - PsiElement(COMMA)(',') - PsiWhiteSpace('\n ') - VALUE_PARAMETER - PsiElement(IDENTIFIER)('a') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiWhiteSpace(' ') - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - LIST_LITERAL - PsiElement(LBRACKET)('[') - PsiElement(IDENTIFIER)('a') - PsiElement(COMMA)(',') - PsiElement(IDENTIFIER)('b') - PsiElement(COMMA)(',') - PsiElement(IDENTIFIER)('d') - PsiElement(COMMA)(',') - PsiElement(IDENTIFIER)('c') - PsiElement(RBRACKET)(']') - PsiElement(COMMA)(',') - PsiWhiteSpace('\n ') - VALUE_PARAMETER - PsiElement(IDENTIFIER)('a') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiWhiteSpace(' ') - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - LIST_LITERAL - PsiElement(LBRACKET)('[') - PsiElement(RBRACKET)(']') - PsiElement(COMMA)(',') - PsiWhiteSpace('\n ') - VALUE_PARAMETER - PsiElement(IDENTIFIER)('a') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiWhiteSpace(' ') - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - LIST_LITERAL - PsiElement(LBRACKET)('[') - INTEGER_CONSTANT - PsiElement(INTEGER_LITERAL)('10') - PsiElement(RBRACKET)(']') - PsiElement(COMMA)(',') - PsiWhiteSpace('\n ') - VALUE_PARAMETER - PsiElement(IDENTIFIER)('a') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiWhiteSpace(' ') - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - RANGE_LITERAL - PsiElement(LBRACKET)('[') - INTEGER_CONSTANT - PsiElement(INTEGER_LITERAL)('10') - PsiElement(RANGE)('..') - INTEGER_CONSTANT - PsiElement(INTEGER_LITERAL)('5') - PsiElement(RBRACKET)(']') - PsiElement(COMMA)(',') - PsiWhiteSpace('\n ') VALUE_PARAMETER PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/TupleTypes.txt b/idea/testData/psi/TupleTypes.txt index 638e7447ac9..0cf3fe66e5e 100644 --- a/idea/testData/psi/TupleTypes.txt +++ b/idea/testData/psi/TupleTypes.txt @@ -91,9 +91,8 @@ JetFile: TupleTypes.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') TUPLE_TYPE @@ -110,9 +109,8 @@ JetFile: TupleTypes.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') TUPLE_TYPE PsiElement(LPAR)('(') @@ -120,9 +118,8 @@ JetFile: TupleTypes.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') USER_TYPE @@ -139,9 +136,8 @@ JetFile: TupleTypes.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') TUPLE_TYPE @@ -150,9 +146,8 @@ JetFile: TupleTypes.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') USER_TYPE @@ -163,9 +158,8 @@ JetFile: TupleTypes.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') USER_TYPE PsiElement(IDENTIFIER)('B') @@ -181,9 +175,8 @@ JetFile: TupleTypes.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') TUPLE_TYPE @@ -197,9 +190,8 @@ JetFile: TupleTypes.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') USER_TYPE @@ -215,9 +207,8 @@ JetFile: TupleTypes.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') USER_TYPE diff --git a/idea/testData/psi/TupleTypes_ERR.txt b/idea/testData/psi/TupleTypes_ERR.txt index db5fb1181be..d449c821dd1 100644 --- a/idea/testData/psi/TupleTypes_ERR.txt +++ b/idea/testData/psi/TupleTypes_ERR.txt @@ -88,9 +88,8 @@ JetFile: TupleTypes_ERR.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') TUPLE_TYPE @@ -107,9 +106,8 @@ JetFile: TupleTypes_ERR.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') TUPLE_TYPE PsiElement(LPAR)('(') @@ -117,9 +115,8 @@ JetFile: TupleTypes_ERR.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiErrorElement:Expecting ']' to close an attribute annotation PsiWhiteSpace(' ') @@ -137,9 +134,8 @@ JetFile: TupleTypes_ERR.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') TUPLE_TYPE @@ -148,9 +144,8 @@ JetFile: TupleTypes_ERR.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') USER_TYPE @@ -161,9 +156,8 @@ JetFile: TupleTypes_ERR.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') USER_TYPE PsiElement(IDENTIFIER)('B') @@ -179,9 +173,8 @@ JetFile: TupleTypes_ERR.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') TUPLE_TYPE @@ -195,9 +188,8 @@ JetFile: TupleTypes_ERR.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') USER_TYPE @@ -213,9 +205,8 @@ JetFile: TupleTypes_ERR.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') USER_TYPE diff --git a/idea/testData/psi/TypeAnnotations.txt b/idea/testData/psi/TypeAnnotations.txt index a391e93281e..e3b84cd86ab 100644 --- a/idea/testData/psi/TypeAnnotations.txt +++ b/idea/testData/psi/TypeAnnotations.txt @@ -17,17 +17,15 @@ JetFile: TypeAnnotations.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('a') + USER_TYPE + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('b') + USER_TYPE + PsiElement(IDENTIFIER)('b') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') USER_TYPE @@ -47,17 +45,15 @@ JetFile: TypeAnnotations.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('b') + USER_TYPE + PsiElement(IDENTIFIER)('b') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') USER_TYPE @@ -68,9 +64,8 @@ JetFile: TypeAnnotations.jet ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') + USER_TYPE + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') TYPE_REFERENCE