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

DescriptorRenderer to render annotations for all types + separate option to render annotation arguments + use it in IdeDescriptorRenderers

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-09-30 21:34:22 +03:00
parent 8baa9ba1de
commit ec51076355
373 changed files with 1433 additions and 1355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/DelegateAnnotations.txt
Vendored
+8 -8
View File
@@ -1,6 +1,6 @@
package
public fun foo(/*0*/ @delegate:Field() @delegate:Prop() x: kotlin.Int): kotlin.Int
public fun foo(/*0*/ @delegate:Field @delegate:Prop x: kotlin.Int): kotlin.Int
public final class CustomDelegate {
public constructor CustomDelegate()
@@ -24,19 +24,19 @@ public final class CustomDelegate {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@delegate:Field() public final class SomeClass {
@delegate:Field() public constructor SomeClass()
@delegate:Field() @delegate:Prop() protected final val delegatedProperty: kotlin.String
@delegate:Field() @delegate:Prop() public final val propertyWithCustomGetter: kotlin.Int
@delegate:Field() @delegate:Prop() protected final val simpleProperty: kotlin.String = "text"
@delegate:Field public final class SomeClass {
@delegate:Field public constructor SomeClass()
@delegate:Field @delegate:Prop protected final val delegatedProperty: kotlin.String
@delegate:Field @delegate:Prop public final val propertyWithCustomGetter: kotlin.Int
@delegate:Field @delegate:Prop protected final val simpleProperty: kotlin.String = "text"
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class WithPrimaryConstructor {
public constructor WithPrimaryConstructor(/*0*/ a: kotlin.String, /*1*/ @param:Field() @param:Prop() b: kotlin.String)
@delegate:Field() @delegate:Prop() public final val a: kotlin.String
public constructor WithPrimaryConstructor(/*0*/ a: kotlin.String, /*1*/ @param:Field @param:Prop b: kotlin.String)
@delegate:Field @delegate:Prop public final val a: kotlin.String
public final val b: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FieldAnnotations.txt
Vendored
+8 -8
View File
@@ -15,13 +15,13 @@ public final class CustomDelegate {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@field:Ann() public final class SomeClass {
@field:Ann() public constructor SomeClass()
@field:Ann() protected final val delegatedProperty: kotlin.String
@field:Ann() public final val propertyWithCustomGetter: kotlin.Int
@field:Ann() protected final val simpleProperty: kotlin.String = "text"
@field:Ann() protected final val simplePropertyWithAnnotationList: kotlin.String = "text"
@field:Ann() public final fun anotherFun(/*0*/ @field:Ann() s: kotlin.String): kotlin.Unit
@field:Ann public final class SomeClass {
@field:Ann public constructor SomeClass()
@field:Ann protected final val delegatedProperty: kotlin.String
@field:Ann public final val propertyWithCustomGetter: kotlin.Int
@field:Ann protected final val simpleProperty: kotlin.String = "text"
@field:Ann protected final val simplePropertyWithAnnotationList: kotlin.String = "text"
@field:Ann public final fun anotherFun(/*0*/ @field:Ann s: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -29,7 +29,7 @@ public final class CustomDelegate {
public final class WithPrimaryConstructor {
public constructor WithPrimaryConstructor(/*0*/ a: kotlin.String)
@field:Ann() public final val a: kotlin.String
@field:Ann public final val a: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.txt
Vendored
+3 -3
View File
@@ -15,14 +15,14 @@ public final class CustomDelegate {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@get:Ann() public final class SomeClass {
@get:Ann() public constructor SomeClass()
@get:Ann public final class SomeClass {
@get:Ann public constructor SomeClass()
protected final val delegatedProperty: kotlin.String
protected final var mutableProperty: kotlin.String
public final val propertyWithCustomGetter: kotlin.Int
protected final val simpleProperty: kotlin.String = "text"
protected final val simplePropertyWithAnnotationList: kotlin.String = "text"
@get:Ann() public final fun annotationOnFunction(/*0*/ a: kotlin.Int): kotlin.Int
@get:Ann public final fun annotationOnFunction(/*0*/ a: kotlin.Int): kotlin.Int
public final fun anotherFun(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ParamAnnotations.txt
Vendored
+5 -5
View File
@@ -8,7 +8,7 @@ public final annotation class Ann : kotlin.Annotation {
}
public final class PrimaryConstructorClass {
public constructor PrimaryConstructorClass(/*0*/ @param:Ann() a: kotlin.String, /*1*/ @param:Ann() @param:Second() b: kotlin.String, /*2*/ @param:Ann() c: kotlin.String)
public constructor PrimaryConstructorClass(/*0*/ @param:Ann a: kotlin.String, /*1*/ @param:Ann @param:Second b: kotlin.String, /*2*/ @param:Ann c: kotlin.String)
public final val c: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -22,10 +22,10 @@ public final annotation class Second : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@param:Ann() public final class SomeClass {
@param:Ann() public constructor SomeClass(/*0*/ @param:Ann() a: kotlin.String)
@param:Ann() protected final val simpleProperty: kotlin.String = "text"
@param:Ann() public final fun anotherFun(): kotlin.Unit
@param:Ann public final class SomeClass {
@param:Ann public constructor SomeClass(/*0*/ @param:Ann a: kotlin.String)
@param:Ann protected final val simpleProperty: kotlin.String = "text"
@param:Ann public final fun anotherFun(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/PropertyAnnotations.txt
Vendored
+8 -8
View File
@@ -22,14 +22,14 @@ public final annotation class Second : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@property:Ann() public final class SomeClass {
@property:Ann() public constructor SomeClass(/*0*/ s: kotlin.String)
@property:Ann() protected final val p1: kotlin.String = ""
@property:Ann() @property:Second() protected final val p2: kotlin.String = ""
@property:Ann() protected final var p3: kotlin.String
@property:Ann() protected final val p4: kotlin.String
@property:Ann() public final var propertyWithCustomSetter: kotlin.Int
@property:Ann() public final fun anotherFun(): kotlin.Unit
@property:Ann public final class SomeClass {
@property:Ann public constructor SomeClass(/*0*/ s: kotlin.String)
@property:Ann protected final val p1: kotlin.String = ""
@property:Ann @property:Second protected final val p2: kotlin.String = ""
@property:Ann protected final var p3: kotlin.String
@property:Ann protected final val p4: kotlin.String
@property:Ann public final var propertyWithCustomSetter: kotlin.Int
@property:Ann public final fun anotherFun(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ReceiverAnnotations.txt
Vendored
+7 -7
View File
@@ -1,7 +1,7 @@
package
public val @receiver:Ann() kotlin.String.extensionProperty: kotlin.String
public fun @receiver:Ann() kotlin.String.length2(): kotlin.Int
public val @receiver:Ann kotlin.String.extensionProperty: kotlin.String
public fun @receiver:Ann kotlin.String.length2(): kotlin.Int
public final annotation class Ann : kotlin.Annotation {
public constructor Ann()
@@ -10,11 +10,11 @@ public final annotation class Ann : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@receiver:Ann() public final class SomeClass {
@receiver:Ann() public constructor SomeClass(/*0*/ @receiver:Ann() a: kotlin.String)
@receiver:Ann() protected final val simpleProperty: kotlin.String = "text"
public final val @receiver:Ann() kotlin.String.extensionProperty2: kotlin.String
@receiver:Ann() public final fun anotherFun(): kotlin.Unit
@receiver:Ann public final class SomeClass {
@receiver:Ann public constructor SomeClass(/*0*/ @receiver:Ann a: kotlin.String)
@receiver:Ann protected final val simpleProperty: kotlin.String = "text"
public final val @receiver:Ann kotlin.String.extensionProperty2: kotlin.String
@receiver:Ann public final fun anotherFun(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.txt
Vendored
+3 -3
View File
@@ -16,14 +16,14 @@ public final class CustomDelegate {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@set:Ann() public final class SomeClass {
@set:Ann public final class SomeClass {
public constructor SomeClass()
protected final var delegatedProperty: kotlin.String
protected final var mutableProperty: kotlin.String
protected final var mutablePropertyWithAnnotationList: kotlin.String
public final var propertyWithCustomSetter: kotlin.Int
@set:Ann() protected final val simpleProperty: kotlin.String = "text"
@set:Ann() public final fun annotationOnFunction(/*0*/ a: kotlin.Int): kotlin.Int
@set:Ann protected final val simpleProperty: kotlin.String = "text"
@set:Ann public final fun annotationOnFunction(/*0*/ a: kotlin.Int): kotlin.Int
public final fun anotherFun(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SparamAnnotations.txt
Vendored
+8 -8
View File
@@ -16,14 +16,14 @@ public final class CustomDelegate {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@setparam:Ann() public final class SomeClass {
@setparam:Ann() public constructor SomeClass()
@setparam:Ann() protected final var delegatedProperty: kotlin.String
@setparam:Ann() protected final var mutableProperty: kotlin.String
@setparam:Ann() protected final var mutablePropertyWithAnnotationList: kotlin.String
@setparam:Ann() public final var propertyWithCustomSetter: kotlin.Int
@setparam:Ann() protected final val simpleProperty: kotlin.String = "text"
@setparam:Ann() public final fun anotherFun(): kotlin.Unit
@setparam:Ann public final class SomeClass {
@setparam:Ann public constructor SomeClass()
@setparam:Ann protected final var delegatedProperty: kotlin.String
@setparam:Ann protected final var mutableProperty: kotlin.String
@setparam:Ann protected final var mutablePropertyWithAnnotationList: kotlin.String
@setparam:Ann public final var propertyWithCustomSetter: kotlin.Int
@setparam:Ann protected final val simpleProperty: kotlin.String = "text"
@setparam:Ann public final fun anotherFun(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.txt
Vendored
+11 -11
View File
@@ -1,16 +1,16 @@
package
public final class A {
public constructor A(/*0*/ @param:Ann() @Ann() x: kotlin.Int, /*1*/ @param:RepeatableAnn() @Ann() y: kotlin.Int)
@property:Ann() @RepeatableAnn() @property:RepeatableAnn() @field:Ann() public final val a: kotlin.Int = 0
@Ann() @property:Ann() @field:Ann() public final val b: kotlin.Int = 0
@field:RepeatableAnn() @field:RepeatableAnn() public final val c: kotlin.Int = 0
@property:RepeatableAnn() @RepeatableAnn() public final val d: kotlin.Int = 0
@property:RepeatableAnn() @RepeatableAnn() @delegate:RepeatableAnn() public final val e: kotlin.String
@property:Ann() @delegate:Ann() public final val f: kotlin.String
@Ann() @delegate:Ann() public final val g: kotlin.String
@Ann() @field:Ann() public final val h: kotlin.String = ""
@property:Ann() @field:Ann() public final val i: kotlin.String = ""
public constructor A(/*0*/ @param:Ann @Ann x: kotlin.Int, /*1*/ @param:RepeatableAnn @Ann y: kotlin.Int)
@property:Ann @RepeatableAnn @property:RepeatableAnn @field:Ann public final val a: kotlin.Int = 0
@Ann @property:Ann @field:Ann public final val b: kotlin.Int = 0
@field:RepeatableAnn @field:RepeatableAnn public final val c: kotlin.Int = 0
@property:RepeatableAnn @RepeatableAnn public final val d: kotlin.Int = 0
@property:RepeatableAnn @RepeatableAnn @delegate:RepeatableAnn public final val e: kotlin.String
@property:Ann @delegate:Ann public final val f: kotlin.String
@Ann @delegate:Ann public final val g: kotlin.String
@Ann @field:Ann public final val h: kotlin.String = ""
@property:Ann @field:Ann public final val i: kotlin.String = ""
public final val x: kotlin.Int
public final val y: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -33,7 +33,7 @@ public final class CustomDelegate {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class RepeatableAnn : kotlin.Annotation {
@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable public final annotation class RepeatableAnn : kotlin.Annotation {
public constructor RepeatableAnn()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int