"annotation" is now parsed as an identifier. It is no longer a soft keyword.
Sometimes it's allowed to parse "annotation" unescaped even if other annotations must be escaped. A set of annotations and their options tests. A swarm of existing tests fixed (mostly kotlin.annotation.annotation() added to txt-files). STUB_VERSION increased. Some quick fixes slightly changed.
This commit is contained in:
Vendored
+1
-1
@@ -1,6 +1,6 @@
|
||||
package test
|
||||
|
||||
internal final annotation class Anno : kotlin.Annotation {
|
||||
kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
|
||||
/*primary*/ public constructor Anno()
|
||||
}
|
||||
|
||||
|
||||
compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt
Vendored
+1
-1
@@ -1,6 +1,6 @@
|
||||
package test
|
||||
|
||||
internal final annotation class Anno : kotlin.Annotation {
|
||||
kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
|
||||
/*primary*/ public constructor Anno()
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -10,14 +10,14 @@ internal final class Class {
|
||||
internal final fun kotlin.String.<get-extension>(): kotlin.String
|
||||
}
|
||||
|
||||
internal final annotation class DoubleAnno : kotlin.Annotation {
|
||||
kotlin.annotation.annotation() internal final annotation class DoubleAnno : kotlin.Annotation {
|
||||
/*primary*/ public constructor DoubleAnno()
|
||||
}
|
||||
|
||||
internal final annotation class IntAnno : kotlin.Annotation {
|
||||
kotlin.annotation.annotation() internal final annotation class IntAnno : kotlin.Annotation {
|
||||
/*primary*/ public constructor IntAnno()
|
||||
}
|
||||
|
||||
internal final annotation class StringAnno : kotlin.Annotation {
|
||||
kotlin.annotation.annotation() internal final annotation class StringAnno : kotlin.Annotation {
|
||||
/*primary*/ public constructor StringAnno()
|
||||
}
|
||||
|
||||
+3
-3
@@ -7,14 +7,14 @@ test.IntAnno() internal val kotlin.Int.extension: kotlin.Int
|
||||
test.StringAnno() internal val kotlin.String.extension: kotlin.String
|
||||
internal fun kotlin.String.<get-extension>(): kotlin.String
|
||||
|
||||
internal final annotation class DoubleAnno : kotlin.Annotation {
|
||||
kotlin.annotation.annotation() internal final annotation class DoubleAnno : kotlin.Annotation {
|
||||
/*primary*/ public constructor DoubleAnno()
|
||||
}
|
||||
|
||||
internal final annotation class IntAnno : kotlin.Annotation {
|
||||
kotlin.annotation.annotation() internal final annotation class IntAnno : kotlin.Annotation {
|
||||
/*primary*/ public constructor IntAnno()
|
||||
}
|
||||
|
||||
internal final annotation class StringAnno : kotlin.Annotation {
|
||||
kotlin.annotation.annotation() internal final annotation class StringAnno : kotlin.Annotation {
|
||||
/*primary*/ public constructor StringAnno()
|
||||
}
|
||||
|
||||
compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt
Vendored
+1
-1
@@ -1,6 +1,6 @@
|
||||
package test
|
||||
|
||||
internal final annotation class Anno : kotlin.Annotation {
|
||||
kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
|
||||
/*primary*/ public constructor Anno()
|
||||
}
|
||||
|
||||
|
||||
Vendored
+1
-1
@@ -3,6 +3,6 @@ package test
|
||||
test.Anno() internal val property: kotlin.Int
|
||||
internal fun <get-property>(): kotlin.Int
|
||||
|
||||
internal final annotation class Anno : kotlin.Annotation {
|
||||
kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
|
||||
/*primary*/ public constructor Anno()
|
||||
}
|
||||
|
||||
Vendored
+1
-1
@@ -1,6 +1,6 @@
|
||||
package test
|
||||
|
||||
internal final annotation class Anno : kotlin.Annotation {
|
||||
kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
|
||||
/*primary*/ public constructor Anno()
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package test
|
||||
|
||||
internal final annotation class Anno : kotlin.Annotation {
|
||||
kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
|
||||
/*primary*/ public constructor Anno()
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user