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/functionReceivers/FunctionTypesWithFunctionReceivers.kt
Vendored
+4 -4
View File
@@ -4,7 +4,7 @@ typealias f = ((T.T.() -> S).() -> S)
typealias f = ((T<A, B>.T<x>.() -> S).() -> S)
typealias f = (((S).() -> S).() -> S)
typealias f = [a] ([a] ((S).() -> S).() -> S)
typealias f = [a] ([a] (T.() -> S).() -> S)
typealias f = [a] ([a] (T<A, B>.() -> S).() -> S)
typealias f = [a] ([a] ((S).() -> S).() -> S)
typealias f = @[a] (@[a] ((S).() -> S).() -> S)
typealias f = @[a] (@[a] (T.() -> S).() -> S)
typealias f = @[a] (@[a] (T<A, B>.() -> S).() -> S)
typealias f = @[a] (@[a] ((S).() -> S).() -> S)
compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt
Vendored
+8
View File
@@ -267,6 +267,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiWhiteSpace(' ')
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -281,6 +282,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -333,6 +335,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiWhiteSpace(' ')
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -347,6 +350,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -397,6 +401,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiWhiteSpace(' ')
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -411,6 +416,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -476,6 +482,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiWhiteSpace(' ')
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -490,6 +497,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.kt
Vendored
+5 -5
View File
@@ -1,8 +1,8 @@
fun ([a] T<T>.(A<B>) -> Unit).foo()
fun ([a] T<T>.(A<B>) -> C<D, E>).foo();
fun [a] ([a] T<T>.(A<B>) -> R).foo() {}
fun <A, B> [a] ((B.(A ->B)) -> Unit).foo()
fun <A, B> [a] ((A, B) -> Unit).foo()
fun (@[a] T<T>.(A<B>) -> Unit).foo()
fun (@[a] T<T>.(A<B>) -> C<D, E>).foo();
fun @[a] (@[a] T<T>.(A<B>) -> R).foo() {}
fun <A, B> @[a] ((B.(A ->B)) -> Unit).foo()
fun <A, B> @[a] ((A, B) -> Unit).foo()
fun ((T) -> G)?.foo()
fun ((T) -> G)??.foo()
compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt
Vendored
+6
View File
@@ -12,6 +12,7 @@ JetFile: FunctionsWithFunctionReceivers.kt
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -72,6 +73,7 @@ JetFile: FunctionsWithFunctionReceivers.kt
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -144,6 +146,7 @@ JetFile: FunctionsWithFunctionReceivers.kt
PsiWhiteSpace(' ')
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -158,6 +161,7 @@ JetFile: FunctionsWithFunctionReceivers.kt
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -228,6 +232,7 @@ JetFile: FunctionsWithFunctionReceivers.kt
PsiWhiteSpace(' ')
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -309,6 +314,7 @@ JetFile: FunctionsWithFunctionReceivers.kt
PsiWhiteSpace(' ')
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversAnnotations.kt
Vendored
+5 -5
View File
@@ -1,5 +1,5 @@
fun ([a] T<T>.(A<B>) -> Unit).foo()
fun ([a] T<T>.(A<B>) -> C<D, E>).foo();
fun [a] ([a] T<T>.(A<B>) -> R).foo() {}
fun <A, B> [a] (() -> Unit).foo()
[a] fun <A, B> [a] ((A, B) -> Unit).foo()
fun (@[a] T<T>.(A<B>) -> Unit).foo()
fun (@[a] T<T>.(A<B>) -> C<D, E>).foo();
fun @[a] (@[a] T<T>.(A<B>) -> R).foo() {}
fun <A, B> @[a] (() -> Unit).foo()
@[a] fun <A, B> @[a] ((A, B) -> Unit).foo()
compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversAnnotations.txt
Vendored
+7
View File
@@ -12,6 +12,7 @@ JetFile: FunctionsWithFunctionReceiversAnnotations.kt
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -72,6 +73,7 @@ JetFile: FunctionsWithFunctionReceiversAnnotations.kt
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -144,6 +146,7 @@ JetFile: FunctionsWithFunctionReceiversAnnotations.kt
PsiWhiteSpace(' ')
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -158,6 +161,7 @@ JetFile: FunctionsWithFunctionReceiversAnnotations.kt
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -228,6 +232,7 @@ JetFile: FunctionsWithFunctionReceiversAnnotations.kt
PsiWhiteSpace(' ')
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -259,6 +264,7 @@ JetFile: FunctionsWithFunctionReceiversAnnotations.kt
FUN
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -282,6 +288,7 @@ JetFile: FunctionsWithFunctionReceiversAnnotations.kt
PsiWhiteSpace(' ')
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.kt
Vendored
+4 -4
View File
@@ -5,11 +5,11 @@ fun ((T) -> G).foo = 0
fun ((T) -> G)?.foo { }
fun ((T) -> G)??.foo { }
fun ([a] T<T>.(A<B>, C<D, E>) -> ).foo() {}
fun fun [a] T<T>.(A<B>).foo()
fun (@[a] T<T>.(A<B>, C<D, E>) -> ).foo() {}
fun fun @[a] T<T>.(A<B>).foo()
fun [a] (T<T>.(A<B>)).foo()
fun [a] ((A<B>)-).foo()
fun @[a] (T<T>.(A<B>)).foo()
fun @[a] ((A<B>)-).foo()
fun ((T)->G).foo<T>
class C<T>.
compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.txt
Vendored
+6 -1
View File
@@ -215,6 +215,7 @@ JetFile: FunctionsWithFunctionReceiversRecovery.kt
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -301,6 +302,7 @@ JetFile: FunctionsWithFunctionReceiversRecovery.kt
PsiWhiteSpace(' ')
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -363,6 +365,7 @@ JetFile: FunctionsWithFunctionReceiversRecovery.kt
PsiWhiteSpace(' ')
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -427,9 +430,11 @@ JetFile: FunctionsWithFunctionReceiversRecovery.kt
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiErrorElement:Expecting function name
PsiElement(LBRACKET)('[')
PsiElement(AT)('@')
PsiErrorElement:Expecting '('
<empty list>
PsiErrorElement:Expecting a top level declaration
PsiElement(LBRACKET)('[')
MODIFIER_LIST
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.kt
Vendored
+2 -2
View File
@@ -11,7 +11,7 @@ val (foo.bar.() -> Unit).foo = foo
val (foo.bar.() -> Unit).foo : bar = foo
[a] public get() {}
@[a] public get() {}
open set(a : b) {}
@@ -20,7 +20,7 @@ val (foo.bar.() -> Unit).foo : bar = foo
val (foo.bar.() -> Unit).foo : bar = foo
[a] public get() {}
@[a] public get() {}
// Error recovery:
compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.txt
Vendored
+2
View File
@@ -222,6 +222,7 @@ JetFile: PropertiesWithFunctionReceivers.kt
PROPERTY_ACCESSOR
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -372,6 +373,7 @@ JetFile: PropertiesWithFunctionReceivers.kt
PROPERTY_ACCESSOR
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversAnnotations.kt
Vendored
+5 -5
View File
@@ -1,5 +1,5 @@
val ([a] T<T>.(A<B>) -> Unit).foo: P
val ([a] T<T>.(A<B>) -> C<D, E>).foo: P
val [a] ([a] T<T>.(A<B>) -> R).foo: P
val <A, B> [a] (() -> Unit).foo: P
[a] val <A, B> [a] ((A, B) -> Unit).foo: P
val (@[a] T<T>.(A<B>) -> Unit).foo: P
val (@[a] T<T>.(A<B>) -> C<D, E>).foo: P
val @[a] (@[a] T<T>.(A<B>) -> R).foo: P
val <A, B> @[a] (() -> Unit).foo: P
@[a] val <A, B> @[a] ((A, B) -> Unit).foo: P
compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversAnnotations.txt
Vendored
+7
View File
@@ -12,6 +12,7 @@ JetFile: PropertiesWithFunctionReceiversAnnotations.kt
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -75,6 +76,7 @@ JetFile: PropertiesWithFunctionReceiversAnnotations.kt
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -149,6 +151,7 @@ JetFile: PropertiesWithFunctionReceiversAnnotations.kt
PsiWhiteSpace(' ')
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -163,6 +166,7 @@ JetFile: PropertiesWithFunctionReceiversAnnotations.kt
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -232,6 +236,7 @@ JetFile: PropertiesWithFunctionReceiversAnnotations.kt
PsiWhiteSpace(' ')
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -266,6 +271,7 @@ JetFile: PropertiesWithFunctionReceiversAnnotations.kt
PROPERTY
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -289,6 +295,7 @@ JetFile: PropertiesWithFunctionReceiversAnnotations.kt
PsiWhiteSpace(' ')
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversRecovery.kt
Vendored
+3 -3
View File
@@ -6,9 +6,9 @@ val ((T) -> G)?.foo
val ((T) -> G)??.foo
val (T<T>.(A<B>, C<D, E>) -> ).foo {}
val val [a] T<T>.(A<B>).foo()
val val @a T<T>.(A<B>).foo()
val [a] (T<T>.(A<B>)).foo()
val [a] ((A<B>)-).foo()
val @[a] (T<T>.(A<B>)).foo()
val @[a] ((A<B>)-).foo()
val c<T> by A.B
compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversRecovery.txt
Vendored
+3 -2
View File
@@ -282,9 +282,8 @@ JetFile: PropertiesWithFunctionReceiversRecovery.kt
PsiErrorElement:Property getter or setter expected
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(LBRACKET)('[')
PsiElement(AT)('@')
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('T')
PsiElement(LT)('<')
@@ -307,6 +306,7 @@ JetFile: PropertiesWithFunctionReceiversRecovery.kt
PsiWhiteSpace(' ')
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
@@ -375,6 +375,7 @@ JetFile: PropertiesWithFunctionReceiversRecovery.kt
PsiErrorElement:Receiver type is not allowed on a multi-declaration
TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE