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

Drop obsolete annotations syntax

Browse Source
This commit is contained in:
Denis Zharkov
2015-06-09 13:55:03 +03:00
parent 26864a4407
commit cf4b1ab7cd
133 changed files with 584 additions and 887 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/psi/annotation/AnnotatedExpressions.kt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
fun foo() {
[a] foo
@[a] foo
1
[a] this
@[a] this
}
compiler/testData/psi/annotation/AnnotatedExpressions.txt
Vendored
+2
View File
@@ -16,6 +16,7 @@ JetFile: AnnotatedExpressions.kt
PsiWhiteSpace('\n ')
ANNOTATED_EXPRESSION
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -33,6 +34,7 @@ JetFile: AnnotatedExpressions.kt
PsiWhiteSpace('\n ')
ANNOTATED_EXPRESSION
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
compiler/testData/psi/annotation/Annotations.kt
Vendored
+7 -7
View File
@@ -12,24 +12,24 @@ private
protected
public
internal
[foo<A, B>(a, b) ina foo.bar.goo.doo<f>.foo<bar, goo>.foo]
[df]
@[foo<A, B>(a, b) ina foo.bar.goo.doo<f>.foo<bar, goo>.foo]
@[df]
in
[sdfsdf]
@[sdfsdf]
out
ref
class Bar<abstract
open
[sdfsdf(1+1) a]
[sdfsdf(1+1)]
[a() sdfsdf(1+1)]
@[sdfsdf(1+1) a]
@[sdfsdf(1+1)]
@[a() sdfsdf(1+1)]
enum
open
annotation
override
open
abstract
[sdfsd sdfsd a.b.f.c]
@[sdfsd sdfsd a.b.f.c]
private
protected
public
compiler/testData/psi/annotation/Annotations.txt
Vendored
+7
View File
@@ -42,6 +42,7 @@ JetFile: Annotations.kt
PsiElement(internal)('internal')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -135,6 +136,7 @@ JetFile: Annotations.kt
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -147,6 +149,7 @@ JetFile: Annotations.kt
PsiElement(in)('in')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -177,6 +180,7 @@ JetFile: Annotations.kt
PsiElement(open)('open')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -205,6 +209,7 @@ JetFile: Annotations.kt
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -226,6 +231,7 @@ JetFile: Annotations.kt
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -269,6 +275,7 @@ JetFile: Annotations.kt
PsiElement(abstract)('abstract')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
compiler/testData/psi/annotation/AnnotationsOnPatterns.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
fun foo() {
when (e) {
is [a] T -> d
is @[a] T -> d
}
}
compiler/testData/psi/annotation/AnnotationsOnPatterns.txt
Vendored
+1
View File
@@ -30,6 +30,7 @@ JetFile: AnnotationsOnPatterns.kt
PsiWhiteSpace(' ')
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
compiler/testData/psi/annotation/Annotations_ERR.kt
Vendored
+6 -6
View File
@@ -8,16 +8,16 @@ annotation
override
open
abstract
[]
@[]
private
protected
public
internal
[foo<A, B>(a, b), ina foo.bar.goo.doo<f>.foo<bar, goo>.foo]
[df]
@[foo<A, B>(a, b), ina foo.bar.goo.doo<f>.foo<bar, goo>.foo]
@[df]
in
[sdfsdf ]
[s fd d, ]
@[sdfsdf ]
@[s fd d, ]
out
ref
class Bar<abstract
@@ -28,7 +28,7 @@ annotation
override
open
abstract
[sdfsd sdfsd a.b.f.c]
@[sdfsd sdfsd a.b.f.c]
private
protected
public
compiler/testData/psi/annotation/Annotations_ERR.txt
Vendored
+6
View File
@@ -34,6 +34,7 @@ JetFile: Annotations_ERR.kt
PsiElement(abstract)('abstract')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
PsiErrorElement:Expecting a list of annotations
<empty list>
@@ -48,6 +49,7 @@ JetFile: Annotations_ERR.kt
PsiElement(internal)('internal')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -143,6 +145,7 @@ JetFile: Annotations_ERR.kt
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -155,6 +158,7 @@ JetFile: Annotations_ERR.kt
PsiElement(in)('in')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -166,6 +170,7 @@ JetFile: Annotations_ERR.kt
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -225,6 +230,7 @@ JetFile: Annotations_ERR.kt
PsiElement(abstract)('abstract')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
compiler/testData/psi/annotation/TypeAnnotations.kt
Vendored
+3 -3
View File
@@ -1,5 +1,5 @@
class F(a : [a] [b] B)
class F(a : @[a] @[b] B)
typealias f = [b] [x] F<[x] A, B>
typealias f = @[b] @[x] F<@[x] A, B>
class C : [a] B, [c d] E by F, [g] H(), [i] () -> Unit
class C : @[a] B, @[c d] E by F, @[g] H(), @[i] () -> Unit
compiler/testData/psi/annotation/TypeAnnotations.txt
Vendored
+9
View File
@@ -17,6 +17,7 @@ JetFile: TypeAnnotations.kt
PsiWhiteSpace(' ')
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -27,6 +28,7 @@ JetFile: TypeAnnotations.kt
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -50,6 +52,7 @@ JetFile: TypeAnnotations.kt
PsiWhiteSpace(' ')
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -60,6 +63,7 @@ JetFile: TypeAnnotations.kt
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -77,6 +81,7 @@ JetFile: TypeAnnotations.kt
TYPE_PROJECTION
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -110,6 +115,7 @@ JetFile: TypeAnnotations.kt
DELEGATOR_SUPER_CLASS
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -127,6 +133,7 @@ JetFile: TypeAnnotations.kt
DELEGATOR_BY
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -157,6 +164,7 @@ JetFile: TypeAnnotations.kt
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -177,6 +185,7 @@ JetFile: TypeAnnotations.kt
DELEGATOR_SUPER_CLASS
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
compiler/testData/psi/annotation/at/declarationsJustAtTyped.kt
Vendored
+3 -3
View File
@@ -1,4 +1,4 @@
private @ [Ann1(1)] Ann3("2") class A(
private @ @[Ann1(1)] Ann3("2") class A(
@ private val x: Int,
@ private var y: Int,
@ open z: Int
@@ -10,10 +10,10 @@ private @ [Ann1(1)] Ann3("2") class A(
@
[inline2] private
@[inline2] private
fun inlineLocal() {}
[Ann]
@[Ann]
private
@
@volatile var x = 1
compiler/testData/psi/annotation/at/declarationsJustAtTyped.txt
Vendored
+3
View File
@@ -11,6 +11,7 @@ JetFile: declarationsJustAtTyped.kt
PsiElement(AT)('@')
PsiWhiteSpace(' ')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -145,6 +146,7 @@ JetFile: declarationsJustAtTyped.kt
PsiElement(AT)('@')
PsiWhiteSpace('\n\n ')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -170,6 +172,7 @@ JetFile: declarationsJustAtTyped.kt
PROPERTY
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
compiler/testData/psi/annotation/at/enumEntries.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
enum class A {
[Ann] @Ann(1) X : A()
@[Ann] @Ann(1) X : A()
@Ann Y : A() {}
compiler/testData/psi/annotation/at/enumEntries.txt
Vendored
+1
View File
@@ -17,6 +17,7 @@ JetFile: enumEntries.kt
ENUM_ENTRY
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
compiler/testData/psi/annotation/at/primaryConstructor.kt
Vendored
+3 -3
View File
@@ -3,7 +3,7 @@ class A1 @Ann1("") ()
class A2 @Ann2("")(x: Int) : B {
}
class A3 [Ann3] private @(x: Int)
class A4 [Ann4] @private @(x: Int)
class A3 @[Ann3] private @(x: Int)
class A4 @[Ann4] @private @(x: Int)
class A5 private @Ann4(x: Int) : B
class A6 [Ann5] @private @ [Ann6]()
class A6 @[Ann5] @private @ @[Ann6]()
compiler/testData/psi/annotation/at/primaryConstructor.txt
Vendored
+5 -1
View File
@@ -84,6 +84,7 @@ JetFile: primaryConstructor.kt
PRIMARY_CONSTRUCTOR
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -117,6 +118,7 @@ JetFile: primaryConstructor.kt
PRIMARY_CONSTRUCTOR
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -192,6 +194,7 @@ JetFile: primaryConstructor.kt
PRIMARY_CONSTRUCTOR
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -207,6 +210,7 @@ JetFile: primaryConstructor.kt
PsiElement(AT)('@')
PsiWhiteSpace(' ')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -217,4 +221,4 @@ JetFile: primaryConstructor.kt
PsiElement(RBRACKET)(']')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiElement(RPAR)(')')
compiler/testData/psi/annotation/at/validDeclarations.kt
Vendored
+6 -6
View File
@@ -1,19 +1,19 @@
private @open [Ann1(1)] @Ann2("1") Ann3("2") class A(
private @open @[Ann1(1)] @Ann2("1") Ann3("2") class A(
@volatile(1) private val x: @AnnType("3") @open Int,
@private var y: Int,
@open z: Int
) {
@private [Ann3(2)] @Ann4("4") fun foo() {
@private @[Ann3(2)] @Ann4("4") fun foo() {
@data class LocalClass
print(1)
@inline(option1, option2)
[inline2] private
@[inline2] private
fun inlineLocal() {}
[Ann]
@[Ann]
private
@abstract
@volatile var x = 1
@@ -22,7 +22,7 @@ private @open [Ann1(1)] @Ann2("1") Ann3("2") class A(
}
val x: Int
@inject [inline] private @open get() = 1
@inject @[inline] private @open get() = 1
@open @ann init {}
@@ -35,7 +35,7 @@ private @open [Ann1(1)] @Ann2("1") Ann3("2") class A(
@private
constructor()
fun <@ann("") [ann] T : R> foo() {}
fun <@ann("") @[ann] T : R> foo() {}
}
@private val x = 1
compiler/testData/psi/annotation/at/validDeclarations.txt
Vendored
+6
View File
@@ -10,6 +10,7 @@ JetFile: validDeclarations.kt
PsiElement(open)('@open')
PsiWhiteSpace(' ')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -156,6 +157,7 @@ JetFile: validDeclarations.kt
PsiElement(private)('@private')
PsiWhiteSpace(' ')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -244,6 +246,7 @@ JetFile: validDeclarations.kt
PsiElement(RPAR)(')')
PsiWhiteSpace('\n\n ')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -269,6 +272,7 @@ JetFile: validDeclarations.kt
PROPERTY
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -365,6 +369,7 @@ JetFile: validDeclarations.kt
PsiElement(IDENTIFIER)('inject')
PsiWhiteSpace(' ')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -466,6 +471,7 @@ JetFile: validDeclarations.kt
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
compiler/testData/psi/annotation/at/validExpressions.kt
Vendored
+1 -1
View File
@@ -25,7 +25,7 @@ fun foo() {
label@simpleName
val x = @ann [ann] l@{
val x = @ann @[ann] l@{
a, b, c -> a
}
}
compiler/testData/psi/annotation/at/validExpressions.txt
Vendored
+1
View File
@@ -336,6 +336,7 @@ JetFile: validExpressions.kt
PsiElement(IDENTIFIER)('ann')
PsiWhiteSpace(' ')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
compiler/testData/psi/annotation/forParameters.kt
Vendored
+3 -3
View File
@@ -1,12 +1,12 @@
fun foo() {
for (@volatile x in z) {}
for ([ann]) {}
for (@[ann]) {}
for (@ in z) {}
for ((x, private data @ann [ann] y) in x) {}
for ((x, private data @ann @[ann] y) in x) {}
for (([ann], x) in pair) {}
for ((@[ann], x) in pair) {}
for (volatile x in 1..100) {}
for (volatile(1) x in 1..100) {}
compiler/testData/psi/annotation/forParameters.txt
Vendored
+3
View File
@@ -49,6 +49,7 @@ JetFile: forParameters.kt
VALUE_PARAMETER
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -124,6 +125,7 @@ JetFile: forParameters.kt
PsiElement(IDENTIFIER)('ann')
PsiWhiteSpace(' ')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -157,6 +159,7 @@ JetFile: forParameters.kt
MULTI_VARIABLE_DECLARATION_ENTRY
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
compiler/testData/psi/annotation/lambda.kt
Vendored
+4 -4
View File
@@ -7,7 +7,7 @@ fun foo() {
print(2)
}
bar @ann [ann] {
bar @ann @[ann] {
print(2)
}
@@ -15,11 +15,11 @@ fun foo() {
print(1)
}
bar() [ann] {
bar() @[ann] {
print(2)
}
bar() @ann [ann] {
bar() @ann @[ann] {
print(2)
}
@@ -30,7 +30,7 @@ fun foo() {
if (true) @ann {
}
else [ann] @ann {
else @[ann] @ann {
}
compiler/testData/psi/annotation/lambda.txt
Vendored
+4
View File
@@ -91,6 +91,7 @@ JetFile: lambda.kt
PsiElement(IDENTIFIER)('ann')
PsiWhiteSpace(' ')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -161,6 +162,7 @@ JetFile: lambda.kt
FUNCTION_LITERAL_ARGUMENT
ANNOTATED_EXPRESSION
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -205,6 +207,7 @@ JetFile: lambda.kt
PsiElement(IDENTIFIER)('ann')
PsiWhiteSpace(' ')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -292,6 +295,7 @@ JetFile: lambda.kt
ELSE
ANNOTATED_EXPRESSION
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
compiler/testData/psi/annotation/lambdaRecovery.kt
Vendored
+3 -3
View File
@@ -7,7 +7,7 @@ fun foo() {
print(1)
}
bar @ [ann] {
bar @ @[ann] {
print(2)
}
@@ -19,7 +19,7 @@ fun foo() {
print(1)
}
bar() [] @ {
bar() @[] @ {
print(2)
}
@@ -34,7 +34,7 @@ fun foo() {
if (true) @ {
}
else [ann] @ ann {
else @[ann] @ ann {
}
}
compiler/testData/psi/annotation/lambdaRecovery.txt
Vendored
+4 -1
View File
@@ -75,6 +75,7 @@ JetFile: lambdaRecovery.kt
PsiElement(AT)('@')
PsiWhiteSpace(' ')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -173,6 +174,7 @@ JetFile: lambdaRecovery.kt
FUNCTION_LITERAL_ARGUMENT
ANNOTATED_EXPRESSION
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
PsiErrorElement:Expecting a list of annotations
<empty list>
@@ -281,6 +283,7 @@ JetFile: lambdaRecovery.kt
ELSE
ANNOTATED_EXPRESSION
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -306,4 +309,4 @@ JetFile: lambdaRecovery.kt
<empty list>
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/annotation/multiDeclaration.kt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
fun foo() {
val (x, private data @ann [ann] y) = pair
val ([ann], x) = pair
val (x, private data @ann @[ann] y) = pair
val (@[ann], x) = pair
@volatile val (@ann x, y) = 1
@volatile val (@ann x, y = 1
compiler/testData/psi/annotation/multiDeclaration.txt
Vendored
+2
View File
@@ -42,6 +42,7 @@ JetFile: multiDeclaration.kt
PsiElement(IDENTIFIER)('ann')
PsiWhiteSpace(' ')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -66,6 +67,7 @@ JetFile: multiDeclaration.kt
MULTI_VARIABLE_DECLARATION_ENTRY
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
compiler/testData/psi/annotation/oldAnnotationsRecovery.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
[data(1)] class A {
fun foo() {
[inline] fun bar() {
return 1
}
[suppress("1")] 1+1
}
}
compiler/testData/psi/annotation/oldAnnotationsRecovery.txt
Vendored
+92
View File
@@ -0,0 +1,92 @@
JetFile: oldAnnotationsRecovery.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PsiErrorElement:Expecting a top level declaration
PsiElement(LBRACKET)('[')
MODIFIER_LIST
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('data')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
PsiElement(RPAR)(')')
PsiErrorElement:Expecting a top level declaration
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('A')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
PsiErrorElement:Expecting an element
PsiElement(LBRACKET)('[')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('inline')
PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('bar')
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
FUNCTION_LITERAL_EXPRESSION
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
BLOCK
RETURN
PsiElement(return)('return')
PsiWhiteSpace(' ')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
PsiErrorElement:Expecting an element
PsiElement(LBRACKET)('[')
CALL_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('suppress')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
STRING_TEMPLATE
PsiElement(OPEN_QUOTE)('"')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)('1')
PsiElement(CLOSING_QUOTE)('"')
PsiElement(RPAR)(')')
PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
PsiElement(INTEGER_LITERAL)('1')
PsiElement(PLUS)('+')
PsiElement(INTEGER_LITERAL)('1')
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
compiler/testData/psi/annotation/onFileObsolete/fileAnnotationInWrongPlace.kt
Vendored
-13
View File
@@ -1,13 +0,0 @@
package bar
[file: foo]
val prop
[file:bar baz]
fun func() {}
[file:baz]
class C
[file:]
interface T
compiler/testData/psi/annotation/onFileObsolete/fileAnnotationInWrongPlace.txt
Vendored
-95
View File
@@ -1,95 +0,0 @@
JetFile: fileAnnotationInWrongPlace.kt
PACKAGE_DIRECTIVE
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
IMPORT_LIST
<empty list>
PsiWhiteSpace('\n\n')
PROPERTY
MODIFIER_LIST
ANNOTATION
PsiElement(LBRACKET)('[')
PsiErrorElement:File annotations are only allowed before package declaration
PsiElement(file)('file')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('prop')
PsiWhiteSpace('\n\n')
FUN
MODIFIER_LIST
ANNOTATION
PsiElement(LBRACKET)('[')
PsiErrorElement:File annotations are only allowed before package declaration
PsiElement(file)('file')
PsiElement(COLON)(':')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('baz')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('func')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n')
CLASS
MODIFIER_LIST
ANNOTATION
PsiElement(LBRACKET)('[')
PsiErrorElement:File annotations are only allowed before package declaration
PsiElement(file)('file')
PsiElement(COLON)(':')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('baz')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('C')
PsiWhiteSpace('\n\n')
CLASS
MODIFIER_LIST
ANNOTATION
PsiElement(LBRACKET)('[')
PsiErrorElement:File annotations are only allowed before package declaration
PsiElement(file)('file')
PsiElement(COLON)(':')
PsiErrorElement:Expecting a list of annotations
<empty list>
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
PsiElement(interface)('interface')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('T')
compiler/testData/psi/annotation/onFileObsolete/manyAnnotationBlocks.kt
Vendored
-3
View File
@@ -1,3 +0,0 @@
[file: foo]
[file:bar baz]
package bar
compiler/testData/psi/annotation/onFileObsolete/manyAnnotationBlocks.txt
Vendored
-41
View File
@@ -1,41 +0,0 @@
JetFile: manyAnnotationBlocks.kt
FILE_ANNOTATION_LIST
ANNOTATION
PsiElement(LBRACKET)('[')
PsiElement(file)('file')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(LBRACKET)('[')
PsiElement(file)('file')
PsiElement(COLON)(':')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('baz')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
PACKAGE_DIRECTIVE
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
IMPORT_LIST
<empty list>
compiler/testData/psi/annotation/onFileObsolete/manyInOneAnnotationBlock.kt
Vendored
-3
View File
@@ -1,3 +0,0 @@
[file: foo bar
baz]
package bar
compiler/testData/psi/annotation/onFileObsolete/manyInOneAnnotationBlock.txt
Vendored
-36
View File
@@ -1,36 +0,0 @@
JetFile: manyInOneAnnotationBlock.kt
FILE_ANNOTATION_LIST
ANNOTATION
PsiElement(LBRACKET)('[')
PsiElement(file)('file')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('baz')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
PACKAGE_DIRECTIVE
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
IMPORT_LIST
<empty list>
compiler/testData/psi/annotation/onFileObsolete/nonFIleAnnotationBeforePackage.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
[foo]
[file bar]
[file, baz]
[file]
[:foo.bar]
[file:]
[:]
package boo
compiler/testData/psi/annotation/onFileObsolete/nonFIleAnnotationBeforePackage.txt
Vendored
-88
View File
@@ -1,88 +0,0 @@
JetFile: nonFIleAnnotationBeforePackage.kt
FILE_ANNOTATION_LIST
ANNOTATION
PsiElement(LBRACKET)('[')
PsiErrorElement:Expecting "file:" prefix for file annotations
<empty list>
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(LBRACKET)('[')
PsiElement(file)('file')
PsiErrorElement:Expecting "file:" prefix for file annotations
<empty list>
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(LBRACKET)('[')
PsiElement(file)('file')
PsiErrorElement:Expecting "file:" prefix for file annotations
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('baz')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(LBRACKET)('[')
PsiElement(file)('file')
PsiErrorElement:Expecting "file:" prefix for file annotations
<empty list>
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(LBRACKET)('[')
PsiErrorElement:Expected 'file' keyword before ':'
PsiElement(COLON)(':')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(LBRACKET)('[')
PsiElement(file)('file')
PsiElement(COLON)(':')
PsiErrorElement:Expecting a list of annotations
<empty list>
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(LBRACKET)('[')
PsiErrorElement:Expected 'file' keyword before ':'
PsiElement(COLON)(':')
PsiErrorElement:Expecting a list of annotations
<empty list>
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
PACKAGE_DIRECTIVE
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('boo')
IMPORT_LIST
<empty list>
compiler/testData/psi/annotation/onFileObsolete/single.kt
Vendored
-2
View File
@@ -1,2 +0,0 @@
[file: foo]
package bar
compiler/testData/psi/annotation/onFileObsolete/single.txt
Vendored
-22
View File
@@ -1,22 +0,0 @@
JetFile: single.kt
FILE_ANNOTATION_LIST
ANNOTATION
PsiElement(LBRACKET)('[')
PsiElement(file)('file')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
PACKAGE_DIRECTIVE
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
IMPORT_LIST
<empty list>
compiler/testData/psi/annotation/onFileObsolete/withoutFileAnnotationAndPackageDeclaration.kt
Vendored
-3
View File
@@ -1,3 +0,0 @@
[ann] fun foo(): String? = null
annotation class ann
compiler/testData/psi/annotation/onFileObsolete/withoutFileAnnotationAndPackageDeclaration.txt
Vendored
-44
View File
@@ -1,44 +0,0 @@
JetFile: withoutFileAnnotationAndPackageDeclaration.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
MODIFIER_LIST
ANNOTATION
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('ann')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
NULLABLE_TYPE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('String')
PsiElement(QUEST)('?')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
NULL
PsiElement(null)('null')
PsiWhiteSpace('\n\n')
CLASS
MODIFIER_LIST
PsiElement(annotation)('annotation')
PsiWhiteSpace(' ')
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('ann')
compiler/testData/psi/annotation/onFileObsolete/withoutPackage.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
[file: foo]
[foo bar]
[file: baz]
fun foo() {}
compiler/testData/psi/annotation/onFileObsolete/withoutPackage.txt
Vendored
-62
View File
@@ -1,62 +0,0 @@
JetFile: withoutPackage.kt
FILE_ANNOTATION_LIST
ANNOTATION
PsiElement(LBRACKET)('[')
PsiElement(file)('file')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiElement(RBRACKET)(']')
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PsiWhiteSpace('\n')
FUN
MODIFIER_LIST
ANNOTATION
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(LBRACKET)('[')
PsiErrorElement:File annotations are only allowed before package declaration
PsiElement(file)('file')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('baz')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
compiler/testData/psi/annotation/onFileObsolete/withoutPackageWithSimpleAnnotation.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
[file: foo]
foo bar
[file: baz]
fun foo() {}
compiler/testData/psi/annotation/onFileObsolete/withoutPackageWithSimpleAnnotation.txt
Vendored
-59
View File
@@ -1,59 +0,0 @@
JetFile: withoutPackageWithSimpleAnnotation.kt
FILE_ANNOTATION_LIST
ANNOTATION
PsiElement(LBRACKET)('[')
PsiElement(file)('file')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiElement(RBRACKET)(']')
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PsiWhiteSpace('\n')
FUN
MODIFIER_LIST
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(LBRACKET)('[')
PsiErrorElement:File annotations are only allowed before package declaration
PsiElement(file)('file')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('baz')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')