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/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