Removed obosolete modifier "ref" from tests
This commit is contained in:
+1
-2
@@ -13,7 +13,6 @@ public
|
|||||||
internal
|
internal
|
||||||
in
|
in
|
||||||
out
|
out
|
||||||
ref
|
|
||||||
class Bar<abstract
|
class Bar<abstract
|
||||||
open
|
open
|
||||||
enum
|
enum
|
||||||
@@ -28,7 +27,7 @@ ref
|
|||||||
internal
|
internal
|
||||||
in
|
in
|
||||||
out
|
out
|
||||||
ref T> {
|
T> {
|
||||||
val abstract
|
val abstract
|
||||||
val open
|
val open
|
||||||
val enum
|
val enum
|
||||||
|
|||||||
+30
-40
@@ -15,37 +15,34 @@ JetFile: SimpleModifiers.kt
|
|||||||
IMPORT_LIST
|
IMPORT_LIST
|
||||||
<empty list>
|
<empty list>
|
||||||
PsiWhiteSpace('\n\n')
|
PsiWhiteSpace('\n\n')
|
||||||
MODIFIER_LIST
|
|
||||||
PsiElement(abstract)('abstract')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(open)('open')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(open)('open')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(annotation)('annotation')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(override)('override')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(open)('open')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(abstract)('abstract')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(private)('private')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(protected)('protected')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(public)('public')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(internal)('internal')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(in)('in')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(out)('out')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiErrorElement:Expecting a top level declaration
|
|
||||||
PsiElement(IDENTIFIER)('ref')
|
|
||||||
PsiWhiteSpace('\n ')
|
|
||||||
CLASS
|
CLASS
|
||||||
|
MODIFIER_LIST
|
||||||
|
PsiElement(abstract)('abstract')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(open)('open')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(open)('open')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(annotation)('annotation')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(override)('override')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(open)('open')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(abstract)('abstract')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(private)('private')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(protected)('protected')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(public)('public')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(internal)('internal')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(in)('in')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(out)('out')
|
||||||
|
PsiWhiteSpace('\n ')
|
||||||
PsiElement(class)('class')
|
PsiElement(class)('class')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
PsiElement(IDENTIFIER)('Bar')
|
PsiElement(IDENTIFIER)('Bar')
|
||||||
@@ -81,17 +78,10 @@ JetFile: SimpleModifiers.kt
|
|||||||
PsiWhiteSpace('\n ')
|
PsiWhiteSpace('\n ')
|
||||||
PsiElement(out)('out')
|
PsiElement(out)('out')
|
||||||
PsiWhiteSpace('\n ')
|
PsiWhiteSpace('\n ')
|
||||||
PsiElement(IDENTIFIER)('ref')
|
|
||||||
PsiWhiteSpace(' ')
|
|
||||||
PsiErrorElement:Missing '>'
|
|
||||||
PsiElement(IDENTIFIER)('T')
|
PsiElement(IDENTIFIER)('T')
|
||||||
PsiErrorElement:Expecting a top level declaration
|
PsiElement(GT)('>')
|
||||||
PsiElement(GT)('>')
|
PsiWhiteSpace(' ')
|
||||||
PsiWhiteSpace(' ')
|
CLASS_BODY
|
||||||
FUN
|
|
||||||
PsiErrorElement:Expecting a top level declaration
|
|
||||||
<empty list>
|
|
||||||
BLOCK
|
|
||||||
PsiElement(LBRACE)('{')
|
PsiElement(LBRACE)('{')
|
||||||
PsiWhiteSpace('\n ')
|
PsiWhiteSpace('\n ')
|
||||||
PROPERTY
|
PROPERTY
|
||||||
|
|||||||
-1
@@ -16,7 +16,6 @@ public
|
|||||||
internal
|
internal
|
||||||
in
|
in
|
||||||
out
|
out
|
||||||
ref
|
|
||||||
class Bar<abstract, abstract enum : T, out open,
|
class Bar<abstract, abstract enum : T, out open,
|
||||||
public protected private internal abstract
|
public protected private internal abstract
|
||||||
open
|
open
|
||||||
|
|||||||
+35
-38
@@ -20,45 +20,42 @@ JetFile: SoftKeywords.kt
|
|||||||
REFERENCE_EXPRESSION
|
REFERENCE_EXPRESSION
|
||||||
PsiElement(IDENTIFIER)('foo')
|
PsiElement(IDENTIFIER)('foo')
|
||||||
PsiWhiteSpace('\n\n')
|
PsiWhiteSpace('\n\n')
|
||||||
MODIFIER_LIST
|
|
||||||
PsiElement(public)('public')
|
|
||||||
PsiWhiteSpace(' ')
|
|
||||||
PsiElement(protected)('protected')
|
|
||||||
PsiWhiteSpace(' ')
|
|
||||||
PsiElement(private)('private')
|
|
||||||
PsiWhiteSpace(' ')
|
|
||||||
PsiElement(internal)('internal')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(abstract)('abstract')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(open)('open')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(open)('open')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(annotation)('annotation')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(override)('override')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(open)('open')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(abstract)('abstract')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(private)('private')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(protected)('protected')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(public)('public')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(internal)('internal')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(in)('in')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiElement(out)('out')
|
|
||||||
PsiWhiteSpace('\n')
|
|
||||||
PsiErrorElement:Expecting a top level declaration
|
|
||||||
PsiElement(IDENTIFIER)('ref')
|
|
||||||
PsiWhiteSpace('\n ')
|
|
||||||
CLASS
|
CLASS
|
||||||
|
MODIFIER_LIST
|
||||||
|
PsiElement(public)('public')
|
||||||
|
PsiWhiteSpace(' ')
|
||||||
|
PsiElement(protected)('protected')
|
||||||
|
PsiWhiteSpace(' ')
|
||||||
|
PsiElement(private)('private')
|
||||||
|
PsiWhiteSpace(' ')
|
||||||
|
PsiElement(internal)('internal')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(abstract)('abstract')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(open)('open')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(open)('open')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(annotation)('annotation')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(override)('override')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(open)('open')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(abstract)('abstract')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(private)('private')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(protected)('protected')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(public)('public')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(internal)('internal')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(in)('in')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(out)('out')
|
||||||
|
PsiWhiteSpace('\n ')
|
||||||
PsiElement(class)('class')
|
PsiElement(class)('class')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
PsiElement(IDENTIFIER)('Bar')
|
PsiElement(IDENTIFIER)('Bar')
|
||||||
|
|||||||
+1
-2
@@ -17,7 +17,6 @@ internal
|
|||||||
in
|
in
|
||||||
@[sdfsdf]
|
@[sdfsdf]
|
||||||
out
|
out
|
||||||
ref
|
|
||||||
class Bar<abstract
|
class Bar<abstract
|
||||||
open
|
open
|
||||||
@[sdfsdf(1+1) a]
|
@[sdfsdf(1+1) a]
|
||||||
@@ -36,5 +35,5 @@ public
|
|||||||
internal
|
internal
|
||||||
in
|
in
|
||||||
out
|
out
|
||||||
ref T> {
|
T> {
|
||||||
}
|
}
|
||||||
|
|||||||
+131
-141
@@ -15,103 +15,39 @@ JetFile: Annotations.kt
|
|||||||
IMPORT_LIST
|
IMPORT_LIST
|
||||||
<empty list>
|
<empty list>
|
||||||
PsiWhiteSpace('\n\n')
|
PsiWhiteSpace('\n\n')
|
||||||
MODIFIER_LIST
|
CLASS
|
||||||
PsiElement(abstract)('abstract')
|
MODIFIER_LIST
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(abstract)('abstract')
|
||||||
PsiElement(open)('open')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(open)('open')
|
||||||
PsiElement(enum)('enum')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(enum)('enum')
|
||||||
PsiElement(open)('open')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(open)('open')
|
||||||
PsiElement(annotation)('annotation')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(annotation)('annotation')
|
||||||
PsiElement(override)('override')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(override)('override')
|
||||||
PsiElement(open)('open')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(open)('open')
|
||||||
PsiElement(abstract)('abstract')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(abstract)('abstract')
|
||||||
PsiElement(private)('private')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(private)('private')
|
||||||
PsiElement(protected)('protected')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(protected)('protected')
|
||||||
PsiElement(public)('public')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(public)('public')
|
||||||
PsiElement(internal)('internal')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(internal)('internal')
|
||||||
ANNOTATION
|
PsiWhiteSpace('\n')
|
||||||
PsiElement(AT)('@')
|
ANNOTATION
|
||||||
PsiElement(LBRACKET)('[')
|
PsiElement(AT)('@')
|
||||||
ANNOTATION_ENTRY
|
PsiElement(LBRACKET)('[')
|
||||||
CONSTRUCTOR_CALLEE
|
ANNOTATION_ENTRY
|
||||||
TYPE_REFERENCE
|
CONSTRUCTOR_CALLEE
|
||||||
USER_TYPE
|
TYPE_REFERENCE
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('foo')
|
|
||||||
TYPE_ARGUMENT_LIST
|
|
||||||
PsiElement(LT)('<')
|
|
||||||
TYPE_PROJECTION
|
|
||||||
TYPE_REFERENCE
|
|
||||||
USER_TYPE
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('A')
|
|
||||||
PsiElement(COMMA)(',')
|
|
||||||
PsiWhiteSpace(' ')
|
|
||||||
TYPE_PROJECTION
|
|
||||||
TYPE_REFERENCE
|
|
||||||
USER_TYPE
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('B')
|
|
||||||
PsiElement(GT)('>')
|
|
||||||
VALUE_ARGUMENT_LIST
|
|
||||||
PsiElement(LPAR)('(')
|
|
||||||
VALUE_ARGUMENT
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('a')
|
|
||||||
PsiElement(COMMA)(',')
|
|
||||||
PsiWhiteSpace(' ')
|
|
||||||
VALUE_ARGUMENT
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('b')
|
|
||||||
PsiElement(RPAR)(')')
|
|
||||||
PsiWhiteSpace(' ')
|
|
||||||
ANNOTATION_ENTRY
|
|
||||||
CONSTRUCTOR_CALLEE
|
|
||||||
TYPE_REFERENCE
|
|
||||||
USER_TYPE
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('ina')
|
|
||||||
PsiWhiteSpace(' ')
|
|
||||||
ANNOTATION_ENTRY
|
|
||||||
CONSTRUCTOR_CALLEE
|
|
||||||
TYPE_REFERENCE
|
|
||||||
USER_TYPE
|
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
USER_TYPE
|
|
||||||
USER_TYPE
|
|
||||||
USER_TYPE
|
|
||||||
USER_TYPE
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('foo')
|
|
||||||
PsiElement(DOT)('.')
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('bar')
|
|
||||||
PsiElement(DOT)('.')
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('goo')
|
|
||||||
PsiElement(DOT)('.')
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('doo')
|
|
||||||
TYPE_ARGUMENT_LIST
|
|
||||||
PsiElement(LT)('<')
|
|
||||||
TYPE_PROJECTION
|
|
||||||
TYPE_REFERENCE
|
|
||||||
USER_TYPE
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('f')
|
|
||||||
PsiElement(GT)('>')
|
|
||||||
PsiElement(DOT)('.')
|
|
||||||
REFERENCE_EXPRESSION
|
REFERENCE_EXPRESSION
|
||||||
PsiElement(IDENTIFIER)('foo')
|
PsiElement(IDENTIFIER)('foo')
|
||||||
TYPE_ARGUMENT_LIST
|
TYPE_ARGUMENT_LIST
|
||||||
@@ -120,50 +56,111 @@ JetFile: Annotations.kt
|
|||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
REFERENCE_EXPRESSION
|
REFERENCE_EXPRESSION
|
||||||
PsiElement(IDENTIFIER)('bar')
|
PsiElement(IDENTIFIER)('A')
|
||||||
PsiElement(COMMA)(',')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
TYPE_PROJECTION
|
TYPE_PROJECTION
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
REFERENCE_EXPRESSION
|
REFERENCE_EXPRESSION
|
||||||
PsiElement(IDENTIFIER)('goo')
|
PsiElement(IDENTIFIER)('B')
|
||||||
PsiElement(GT)('>')
|
PsiElement(GT)('>')
|
||||||
PsiElement(DOT)('.')
|
VALUE_ARGUMENT_LIST
|
||||||
|
PsiElement(LPAR)('(')
|
||||||
|
VALUE_ARGUMENT
|
||||||
REFERENCE_EXPRESSION
|
REFERENCE_EXPRESSION
|
||||||
PsiElement(IDENTIFIER)('foo')
|
PsiElement(IDENTIFIER)('a')
|
||||||
PsiElement(RBRACKET)(']')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace('\n')
|
PsiWhiteSpace(' ')
|
||||||
ANNOTATION
|
VALUE_ARGUMENT
|
||||||
PsiElement(AT)('@')
|
|
||||||
PsiElement(LBRACKET)('[')
|
|
||||||
ANNOTATION_ENTRY
|
|
||||||
CONSTRUCTOR_CALLEE
|
|
||||||
TYPE_REFERENCE
|
|
||||||
USER_TYPE
|
|
||||||
REFERENCE_EXPRESSION
|
REFERENCE_EXPRESSION
|
||||||
PsiElement(IDENTIFIER)('df')
|
PsiElement(IDENTIFIER)('b')
|
||||||
PsiElement(RBRACKET)(']')
|
PsiElement(RPAR)(')')
|
||||||
PsiWhiteSpace('\n')
|
PsiWhiteSpace(' ')
|
||||||
PsiElement(in)('in')
|
ANNOTATION_ENTRY
|
||||||
PsiWhiteSpace('\n')
|
CONSTRUCTOR_CALLEE
|
||||||
ANNOTATION
|
TYPE_REFERENCE
|
||||||
PsiElement(AT)('@')
|
USER_TYPE
|
||||||
PsiElement(LBRACKET)('[')
|
REFERENCE_EXPRESSION
|
||||||
ANNOTATION_ENTRY
|
PsiElement(IDENTIFIER)('ina')
|
||||||
CONSTRUCTOR_CALLEE
|
PsiWhiteSpace(' ')
|
||||||
TYPE_REFERENCE
|
ANNOTATION_ENTRY
|
||||||
USER_TYPE
|
CONSTRUCTOR_CALLEE
|
||||||
REFERENCE_EXPRESSION
|
TYPE_REFERENCE
|
||||||
PsiElement(IDENTIFIER)('sdfsdf')
|
USER_TYPE
|
||||||
PsiElement(RBRACKET)(']')
|
USER_TYPE
|
||||||
PsiWhiteSpace('\n')
|
USER_TYPE
|
||||||
PsiElement(out)('out')
|
USER_TYPE
|
||||||
PsiWhiteSpace('\n')
|
USER_TYPE
|
||||||
PsiErrorElement:Expecting a top level declaration
|
USER_TYPE
|
||||||
PsiElement(IDENTIFIER)('ref')
|
REFERENCE_EXPRESSION
|
||||||
PsiWhiteSpace('\n ')
|
PsiElement(IDENTIFIER)('foo')
|
||||||
CLASS
|
PsiElement(DOT)('.')
|
||||||
|
REFERENCE_EXPRESSION
|
||||||
|
PsiElement(IDENTIFIER)('bar')
|
||||||
|
PsiElement(DOT)('.')
|
||||||
|
REFERENCE_EXPRESSION
|
||||||
|
PsiElement(IDENTIFIER)('goo')
|
||||||
|
PsiElement(DOT)('.')
|
||||||
|
REFERENCE_EXPRESSION
|
||||||
|
PsiElement(IDENTIFIER)('doo')
|
||||||
|
TYPE_ARGUMENT_LIST
|
||||||
|
PsiElement(LT)('<')
|
||||||
|
TYPE_PROJECTION
|
||||||
|
TYPE_REFERENCE
|
||||||
|
USER_TYPE
|
||||||
|
REFERENCE_EXPRESSION
|
||||||
|
PsiElement(IDENTIFIER)('f')
|
||||||
|
PsiElement(GT)('>')
|
||||||
|
PsiElement(DOT)('.')
|
||||||
|
REFERENCE_EXPRESSION
|
||||||
|
PsiElement(IDENTIFIER)('foo')
|
||||||
|
TYPE_ARGUMENT_LIST
|
||||||
|
PsiElement(LT)('<')
|
||||||
|
TYPE_PROJECTION
|
||||||
|
TYPE_REFERENCE
|
||||||
|
USER_TYPE
|
||||||
|
REFERENCE_EXPRESSION
|
||||||
|
PsiElement(IDENTIFIER)('bar')
|
||||||
|
PsiElement(COMMA)(',')
|
||||||
|
PsiWhiteSpace(' ')
|
||||||
|
TYPE_PROJECTION
|
||||||
|
TYPE_REFERENCE
|
||||||
|
USER_TYPE
|
||||||
|
REFERENCE_EXPRESSION
|
||||||
|
PsiElement(IDENTIFIER)('goo')
|
||||||
|
PsiElement(GT)('>')
|
||||||
|
PsiElement(DOT)('.')
|
||||||
|
REFERENCE_EXPRESSION
|
||||||
|
PsiElement(IDENTIFIER)('foo')
|
||||||
|
PsiElement(RBRACKET)(']')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
ANNOTATION
|
||||||
|
PsiElement(AT)('@')
|
||||||
|
PsiElement(LBRACKET)('[')
|
||||||
|
ANNOTATION_ENTRY
|
||||||
|
CONSTRUCTOR_CALLEE
|
||||||
|
TYPE_REFERENCE
|
||||||
|
USER_TYPE
|
||||||
|
REFERENCE_EXPRESSION
|
||||||
|
PsiElement(IDENTIFIER)('df')
|
||||||
|
PsiElement(RBRACKET)(']')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(in)('in')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
ANNOTATION
|
||||||
|
PsiElement(AT)('@')
|
||||||
|
PsiElement(LBRACKET)('[')
|
||||||
|
ANNOTATION_ENTRY
|
||||||
|
CONSTRUCTOR_CALLEE
|
||||||
|
TYPE_REFERENCE
|
||||||
|
USER_TYPE
|
||||||
|
REFERENCE_EXPRESSION
|
||||||
|
PsiElement(IDENTIFIER)('sdfsdf')
|
||||||
|
PsiElement(RBRACKET)(']')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(out)('out')
|
||||||
|
PsiWhiteSpace('\n ')
|
||||||
PsiElement(class)('class')
|
PsiElement(class)('class')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
PsiElement(IDENTIFIER)('Bar')
|
PsiElement(IDENTIFIER)('Bar')
|
||||||
@@ -319,17 +316,10 @@ JetFile: Annotations.kt
|
|||||||
PsiWhiteSpace('\n')
|
PsiWhiteSpace('\n')
|
||||||
PsiElement(out)('out')
|
PsiElement(out)('out')
|
||||||
PsiWhiteSpace('\n')
|
PsiWhiteSpace('\n')
|
||||||
PsiElement(IDENTIFIER)('ref')
|
|
||||||
PsiWhiteSpace(' ')
|
|
||||||
PsiErrorElement:Missing '>'
|
|
||||||
PsiElement(IDENTIFIER)('T')
|
PsiElement(IDENTIFIER)('T')
|
||||||
PsiErrorElement:Expecting a top level declaration
|
PsiElement(GT)('>')
|
||||||
PsiElement(GT)('>')
|
PsiWhiteSpace(' ')
|
||||||
PsiWhiteSpace(' ')
|
CLASS_BODY
|
||||||
FUN
|
|
||||||
PsiErrorElement:Expecting a top level declaration
|
|
||||||
<empty list>
|
|
||||||
BLOCK
|
|
||||||
PsiElement(LBRACE)('{')
|
PsiElement(LBRACE)('{')
|
||||||
PsiWhiteSpace('\n')
|
PsiWhiteSpace('\n')
|
||||||
PsiElement(RBRACE)('}')
|
PsiElement(RBRACE)('}')
|
||||||
+1
-2
@@ -19,7 +19,6 @@ in
|
|||||||
@[sdfsdf ]
|
@[sdfsdf ]
|
||||||
@[s fd d, ]
|
@[s fd d, ]
|
||||||
out
|
out
|
||||||
ref
|
|
||||||
class Bar<abstract
|
class Bar<abstract
|
||||||
open
|
open
|
||||||
enum
|
enum
|
||||||
@@ -35,5 +34,5 @@ public
|
|||||||
internal
|
internal
|
||||||
in
|
in
|
||||||
out
|
out
|
||||||
ref T> {
|
T> {
|
||||||
}
|
}
|
||||||
|
|||||||
+169
-179
@@ -15,112 +15,46 @@ JetFile: Annotations_ERR.kt
|
|||||||
IMPORT_LIST
|
IMPORT_LIST
|
||||||
<empty list>
|
<empty list>
|
||||||
PsiWhiteSpace('\n\n')
|
PsiWhiteSpace('\n\n')
|
||||||
MODIFIER_LIST
|
CLASS
|
||||||
PsiElement(abstract)('abstract')
|
MODIFIER_LIST
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(abstract)('abstract')
|
||||||
PsiElement(open)('open')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(open)('open')
|
||||||
PsiElement(enum)('enum')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(enum)('enum')
|
||||||
PsiElement(open)('open')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(open)('open')
|
||||||
PsiElement(annotation)('annotation')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(annotation)('annotation')
|
||||||
PsiElement(override)('override')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(override)('override')
|
||||||
PsiElement(open)('open')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(open)('open')
|
||||||
PsiElement(abstract)('abstract')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(abstract)('abstract')
|
||||||
ANNOTATION
|
PsiWhiteSpace('\n')
|
||||||
PsiElement(AT)('@')
|
ANNOTATION
|
||||||
PsiElement(LBRACKET)('[')
|
PsiElement(AT)('@')
|
||||||
PsiErrorElement:Expecting a list of annotations
|
PsiElement(LBRACKET)('[')
|
||||||
<empty list>
|
PsiErrorElement:Expecting a list of annotations
|
||||||
PsiElement(RBRACKET)(']')
|
<empty list>
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(RBRACKET)(']')
|
||||||
PsiElement(private)('private')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(private)('private')
|
||||||
PsiElement(protected)('protected')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(protected)('protected')
|
||||||
PsiElement(public)('public')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(public)('public')
|
||||||
PsiElement(internal)('internal')
|
PsiWhiteSpace('\n')
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(internal)('internal')
|
||||||
ANNOTATION
|
PsiWhiteSpace('\n')
|
||||||
PsiElement(AT)('@')
|
ANNOTATION
|
||||||
PsiElement(LBRACKET)('[')
|
PsiElement(AT)('@')
|
||||||
ANNOTATION_ENTRY
|
PsiElement(LBRACKET)('[')
|
||||||
CONSTRUCTOR_CALLEE
|
ANNOTATION_ENTRY
|
||||||
TYPE_REFERENCE
|
CONSTRUCTOR_CALLEE
|
||||||
USER_TYPE
|
TYPE_REFERENCE
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('foo')
|
|
||||||
TYPE_ARGUMENT_LIST
|
|
||||||
PsiElement(LT)('<')
|
|
||||||
TYPE_PROJECTION
|
|
||||||
TYPE_REFERENCE
|
|
||||||
USER_TYPE
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('A')
|
|
||||||
PsiElement(COMMA)(',')
|
|
||||||
PsiWhiteSpace(' ')
|
|
||||||
TYPE_PROJECTION
|
|
||||||
TYPE_REFERENCE
|
|
||||||
USER_TYPE
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('B')
|
|
||||||
PsiElement(GT)('>')
|
|
||||||
VALUE_ARGUMENT_LIST
|
|
||||||
PsiElement(LPAR)('(')
|
|
||||||
VALUE_ARGUMENT
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('a')
|
|
||||||
PsiElement(COMMA)(',')
|
|
||||||
PsiWhiteSpace(' ')
|
|
||||||
VALUE_ARGUMENT
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('b')
|
|
||||||
PsiElement(RPAR)(')')
|
|
||||||
PsiErrorElement:No commas needed to separate annotations
|
|
||||||
PsiElement(COMMA)(',')
|
|
||||||
PsiWhiteSpace(' ')
|
|
||||||
ANNOTATION_ENTRY
|
|
||||||
CONSTRUCTOR_CALLEE
|
|
||||||
TYPE_REFERENCE
|
|
||||||
USER_TYPE
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('ina')
|
|
||||||
PsiWhiteSpace(' ')
|
|
||||||
ANNOTATION_ENTRY
|
|
||||||
CONSTRUCTOR_CALLEE
|
|
||||||
TYPE_REFERENCE
|
|
||||||
USER_TYPE
|
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
USER_TYPE
|
|
||||||
USER_TYPE
|
|
||||||
USER_TYPE
|
|
||||||
USER_TYPE
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('foo')
|
|
||||||
PsiElement(DOT)('.')
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('bar')
|
|
||||||
PsiElement(DOT)('.')
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('goo')
|
|
||||||
PsiElement(DOT)('.')
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('doo')
|
|
||||||
TYPE_ARGUMENT_LIST
|
|
||||||
PsiElement(LT)('<')
|
|
||||||
TYPE_PROJECTION
|
|
||||||
TYPE_REFERENCE
|
|
||||||
USER_TYPE
|
|
||||||
REFERENCE_EXPRESSION
|
|
||||||
PsiElement(IDENTIFIER)('f')
|
|
||||||
PsiElement(GT)('>')
|
|
||||||
PsiElement(DOT)('.')
|
|
||||||
REFERENCE_EXPRESSION
|
REFERENCE_EXPRESSION
|
||||||
PsiElement(IDENTIFIER)('foo')
|
PsiElement(IDENTIFIER)('foo')
|
||||||
TYPE_ARGUMENT_LIST
|
TYPE_ARGUMENT_LIST
|
||||||
@@ -129,79 +63,142 @@ JetFile: Annotations_ERR.kt
|
|||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
REFERENCE_EXPRESSION
|
REFERENCE_EXPRESSION
|
||||||
PsiElement(IDENTIFIER)('bar')
|
PsiElement(IDENTIFIER)('A')
|
||||||
PsiElement(COMMA)(',')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
TYPE_PROJECTION
|
TYPE_PROJECTION
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
REFERENCE_EXPRESSION
|
REFERENCE_EXPRESSION
|
||||||
PsiElement(IDENTIFIER)('goo')
|
PsiElement(IDENTIFIER)('B')
|
||||||
PsiElement(GT)('>')
|
PsiElement(GT)('>')
|
||||||
PsiElement(DOT)('.')
|
VALUE_ARGUMENT_LIST
|
||||||
|
PsiElement(LPAR)('(')
|
||||||
|
VALUE_ARGUMENT
|
||||||
REFERENCE_EXPRESSION
|
REFERENCE_EXPRESSION
|
||||||
PsiElement(IDENTIFIER)('foo')
|
PsiElement(IDENTIFIER)('a')
|
||||||
PsiElement(RBRACKET)(']')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace('\n')
|
PsiWhiteSpace(' ')
|
||||||
ANNOTATION
|
VALUE_ARGUMENT
|
||||||
PsiElement(AT)('@')
|
|
||||||
PsiElement(LBRACKET)('[')
|
|
||||||
ANNOTATION_ENTRY
|
|
||||||
CONSTRUCTOR_CALLEE
|
|
||||||
TYPE_REFERENCE
|
|
||||||
USER_TYPE
|
|
||||||
REFERENCE_EXPRESSION
|
REFERENCE_EXPRESSION
|
||||||
PsiElement(IDENTIFIER)('df')
|
PsiElement(IDENTIFIER)('b')
|
||||||
PsiElement(RBRACKET)(']')
|
PsiElement(RPAR)(')')
|
||||||
PsiWhiteSpace('\n')
|
PsiErrorElement:No commas needed to separate annotations
|
||||||
PsiElement(in)('in')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace('\n')
|
PsiWhiteSpace(' ')
|
||||||
ANNOTATION
|
ANNOTATION_ENTRY
|
||||||
PsiElement(AT)('@')
|
CONSTRUCTOR_CALLEE
|
||||||
PsiElement(LBRACKET)('[')
|
TYPE_REFERENCE
|
||||||
ANNOTATION_ENTRY
|
USER_TYPE
|
||||||
CONSTRUCTOR_CALLEE
|
REFERENCE_EXPRESSION
|
||||||
TYPE_REFERENCE
|
PsiElement(IDENTIFIER)('ina')
|
||||||
USER_TYPE
|
PsiWhiteSpace(' ')
|
||||||
REFERENCE_EXPRESSION
|
ANNOTATION_ENTRY
|
||||||
PsiElement(IDENTIFIER)('sdfsdf')
|
CONSTRUCTOR_CALLEE
|
||||||
PsiWhiteSpace(' ')
|
TYPE_REFERENCE
|
||||||
PsiElement(RBRACKET)(']')
|
USER_TYPE
|
||||||
PsiWhiteSpace('\n')
|
USER_TYPE
|
||||||
ANNOTATION
|
USER_TYPE
|
||||||
PsiElement(AT)('@')
|
USER_TYPE
|
||||||
PsiElement(LBRACKET)('[')
|
USER_TYPE
|
||||||
ANNOTATION_ENTRY
|
USER_TYPE
|
||||||
CONSTRUCTOR_CALLEE
|
REFERENCE_EXPRESSION
|
||||||
TYPE_REFERENCE
|
PsiElement(IDENTIFIER)('foo')
|
||||||
USER_TYPE
|
PsiElement(DOT)('.')
|
||||||
REFERENCE_EXPRESSION
|
REFERENCE_EXPRESSION
|
||||||
PsiElement(IDENTIFIER)('s')
|
PsiElement(IDENTIFIER)('bar')
|
||||||
PsiWhiteSpace(' ')
|
PsiElement(DOT)('.')
|
||||||
ANNOTATION_ENTRY
|
REFERENCE_EXPRESSION
|
||||||
CONSTRUCTOR_CALLEE
|
PsiElement(IDENTIFIER)('goo')
|
||||||
TYPE_REFERENCE
|
PsiElement(DOT)('.')
|
||||||
USER_TYPE
|
REFERENCE_EXPRESSION
|
||||||
REFERENCE_EXPRESSION
|
PsiElement(IDENTIFIER)('doo')
|
||||||
PsiElement(IDENTIFIER)('fd')
|
TYPE_ARGUMENT_LIST
|
||||||
PsiWhiteSpace(' ')
|
PsiElement(LT)('<')
|
||||||
ANNOTATION_ENTRY
|
TYPE_PROJECTION
|
||||||
CONSTRUCTOR_CALLEE
|
TYPE_REFERENCE
|
||||||
TYPE_REFERENCE
|
USER_TYPE
|
||||||
USER_TYPE
|
REFERENCE_EXPRESSION
|
||||||
REFERENCE_EXPRESSION
|
PsiElement(IDENTIFIER)('f')
|
||||||
PsiElement(IDENTIFIER)('d')
|
PsiElement(GT)('>')
|
||||||
PsiErrorElement:No commas needed to separate annotations
|
PsiElement(DOT)('.')
|
||||||
PsiElement(COMMA)(',')
|
REFERENCE_EXPRESSION
|
||||||
PsiWhiteSpace(' ')
|
PsiElement(IDENTIFIER)('foo')
|
||||||
PsiElement(RBRACKET)(']')
|
TYPE_ARGUMENT_LIST
|
||||||
PsiWhiteSpace('\n')
|
PsiElement(LT)('<')
|
||||||
PsiElement(out)('out')
|
TYPE_PROJECTION
|
||||||
PsiWhiteSpace('\n')
|
TYPE_REFERENCE
|
||||||
PsiErrorElement:Expecting a top level declaration
|
USER_TYPE
|
||||||
PsiElement(IDENTIFIER)('ref')
|
REFERENCE_EXPRESSION
|
||||||
PsiWhiteSpace('\n ')
|
PsiElement(IDENTIFIER)('bar')
|
||||||
CLASS
|
PsiElement(COMMA)(',')
|
||||||
|
PsiWhiteSpace(' ')
|
||||||
|
TYPE_PROJECTION
|
||||||
|
TYPE_REFERENCE
|
||||||
|
USER_TYPE
|
||||||
|
REFERENCE_EXPRESSION
|
||||||
|
PsiElement(IDENTIFIER)('goo')
|
||||||
|
PsiElement(GT)('>')
|
||||||
|
PsiElement(DOT)('.')
|
||||||
|
REFERENCE_EXPRESSION
|
||||||
|
PsiElement(IDENTIFIER)('foo')
|
||||||
|
PsiElement(RBRACKET)(']')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
ANNOTATION
|
||||||
|
PsiElement(AT)('@')
|
||||||
|
PsiElement(LBRACKET)('[')
|
||||||
|
ANNOTATION_ENTRY
|
||||||
|
CONSTRUCTOR_CALLEE
|
||||||
|
TYPE_REFERENCE
|
||||||
|
USER_TYPE
|
||||||
|
REFERENCE_EXPRESSION
|
||||||
|
PsiElement(IDENTIFIER)('df')
|
||||||
|
PsiElement(RBRACKET)(']')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(in)('in')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
ANNOTATION
|
||||||
|
PsiElement(AT)('@')
|
||||||
|
PsiElement(LBRACKET)('[')
|
||||||
|
ANNOTATION_ENTRY
|
||||||
|
CONSTRUCTOR_CALLEE
|
||||||
|
TYPE_REFERENCE
|
||||||
|
USER_TYPE
|
||||||
|
REFERENCE_EXPRESSION
|
||||||
|
PsiElement(IDENTIFIER)('sdfsdf')
|
||||||
|
PsiWhiteSpace(' ')
|
||||||
|
PsiElement(RBRACKET)(']')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
ANNOTATION
|
||||||
|
PsiElement(AT)('@')
|
||||||
|
PsiElement(LBRACKET)('[')
|
||||||
|
ANNOTATION_ENTRY
|
||||||
|
CONSTRUCTOR_CALLEE
|
||||||
|
TYPE_REFERENCE
|
||||||
|
USER_TYPE
|
||||||
|
REFERENCE_EXPRESSION
|
||||||
|
PsiElement(IDENTIFIER)('s')
|
||||||
|
PsiWhiteSpace(' ')
|
||||||
|
ANNOTATION_ENTRY
|
||||||
|
CONSTRUCTOR_CALLEE
|
||||||
|
TYPE_REFERENCE
|
||||||
|
USER_TYPE
|
||||||
|
REFERENCE_EXPRESSION
|
||||||
|
PsiElement(IDENTIFIER)('fd')
|
||||||
|
PsiWhiteSpace(' ')
|
||||||
|
ANNOTATION_ENTRY
|
||||||
|
CONSTRUCTOR_CALLEE
|
||||||
|
TYPE_REFERENCE
|
||||||
|
USER_TYPE
|
||||||
|
REFERENCE_EXPRESSION
|
||||||
|
PsiElement(IDENTIFIER)('d')
|
||||||
|
PsiErrorElement:No commas needed to separate annotations
|
||||||
|
PsiElement(COMMA)(',')
|
||||||
|
PsiWhiteSpace(' ')
|
||||||
|
PsiElement(RBRACKET)(']')
|
||||||
|
PsiWhiteSpace('\n')
|
||||||
|
PsiElement(out)('out')
|
||||||
|
PsiWhiteSpace('\n ')
|
||||||
PsiElement(class)('class')
|
PsiElement(class)('class')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
PsiElement(IDENTIFIER)('Bar')
|
PsiElement(IDENTIFIER)('Bar')
|
||||||
@@ -274,17 +271,10 @@ JetFile: Annotations_ERR.kt
|
|||||||
PsiWhiteSpace('\n')
|
PsiWhiteSpace('\n')
|
||||||
PsiElement(out)('out')
|
PsiElement(out)('out')
|
||||||
PsiWhiteSpace('\n')
|
PsiWhiteSpace('\n')
|
||||||
PsiElement(IDENTIFIER)('ref')
|
|
||||||
PsiWhiteSpace(' ')
|
|
||||||
PsiErrorElement:Missing '>'
|
|
||||||
PsiElement(IDENTIFIER)('T')
|
PsiElement(IDENTIFIER)('T')
|
||||||
PsiErrorElement:Expecting a top level declaration
|
PsiElement(GT)('>')
|
||||||
PsiElement(GT)('>')
|
PsiWhiteSpace(' ')
|
||||||
PsiWhiteSpace(' ')
|
CLASS_BODY
|
||||||
FUN
|
|
||||||
PsiErrorElement:Expecting a top level declaration
|
|
||||||
<empty list>
|
|
||||||
BLOCK
|
|
||||||
PsiElement(LBRACE)('{')
|
PsiElement(LBRACE)('{')
|
||||||
PsiWhiteSpace('\n')
|
PsiWhiteSpace('\n')
|
||||||
PsiElement(RBRACE)('}')
|
PsiElement(RBRACE)('}')
|
||||||
Reference in New Issue
Block a user