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/loadJava/compiledJava/annotations/AnnotatedAnnotation.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
package test
@test.AnnotatedAnnotation() public final annotation class AnnotatedAnnotation : kotlin.Annotation {
@test.AnnotatedAnnotation public final annotation class AnnotatedAnnotation : kotlin.Annotation {
public constructor AnnotatedAnnotation()
}
compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
public final enum class AnnotatedEnumEntry : kotlin.Enum<test.AnnotatedEnumEntry!> {
@test.AnnotatedEnumEntry.Anno(value = "a") enum entry E1
@test.AnnotatedEnumEntry.Anno(value = "b") @test.AnnotatedEnumEntry.Anno2() enum entry E2
@test.AnnotatedEnumEntry.Anno(value = "b") @test.AnnotatedEnumEntry.Anno2 enum entry E2
enum entry E3
compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.txt
Vendored
+3 -3
View File
@@ -7,7 +7,7 @@ public open class AnnotationRetentions {
public constructor BaseAnnotation()
}
@test.AnnotationRetentions.BaseAnnotation() public/*package*/ open inner class BaseClass {
@test.AnnotationRetentions.BaseAnnotation public/*package*/ open inner class BaseClass {
public/*package*/ constructor BaseClass()
}
@@ -15,7 +15,7 @@ public open class AnnotationRetentions {
public constructor BinaryAnnotation()
}
@test.AnnotationRetentions.BinaryAnnotation() public/*package*/ open inner class BinaryClass {
@test.AnnotationRetentions.BinaryAnnotation public/*package*/ open inner class BinaryClass {
public/*package*/ constructor BinaryClass()
}
@@ -23,7 +23,7 @@ public open class AnnotationRetentions {
public constructor RuntimeAnnotation()
}
@test.AnnotationRetentions.RuntimeAnnotation() public/*package*/ open inner class RuntimeClass {
@test.AnnotationRetentions.RuntimeAnnotation public/*package*/ open inner class RuntimeClass {
public/*package*/ constructor RuntimeClass()
}
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.txt
Vendored
+1 -1
View File
@@ -9,6 +9,6 @@ public interface InheritNullability {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull() p0: kotlin.String): kotlin.Unit
public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull p0: kotlin.String): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public interface Kt3302 {
public interface BSONObject {
public abstract fun dummy(): kotlin.Unit
public abstract fun put(/*0*/ @org.jetbrains.annotations.NotNull() p0: kotlin.String, /*1*/ @org.jetbrains.annotations.NotNull() p1: kotlin.Any): kotlin.Any!
public abstract fun put(/*0*/ @org.jetbrains.annotations.NotNull p0: kotlin.String, /*1*/ @org.jetbrains.annotations.NotNull p1: kotlin.Any): kotlin.Any!
}
public interface BasicBSONObject : test.Kt3302.LinkedHashMap<kotlin.String!, kotlin.Any!>, test.Kt3302.BSONObject {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt
Vendored
+1 -1
View File
@@ -9,6 +9,6 @@ public interface NotNullToNullable {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull() p0: kotlin.String): kotlin.Unit
public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull p0: kotlin.String): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public interface NullableToNotNull {
public interface Sub : test.NullableToNotNull.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull() p0: kotlin.String): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull p0: kotlin.String): kotlin.Unit
}
public interface Super {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ public interface SubclassFromGenericAndNot {
public interface NonGeneric {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull() p0: kotlin.String): kotlin.Unit
public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull p0: kotlin.String): kotlin.Unit
}
public interface Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String!> {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public interface AddNotNullJavaSubtype {
public interface Sub : test.AddNotNullJavaSubtype.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
@org.jetbrains.annotations.NotNull() public abstract override /*1*/ fun foo(): kotlin.String
@org.jetbrains.annotations.NotNull public abstract override /*1*/ fun foo(): kotlin.String
}
public interface Super {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public interface AddNotNullSameJavaType {
public interface Sub : test.AddNotNullSameJavaType.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
@org.jetbrains.annotations.NotNull() public abstract override /*1*/ fun foo(): kotlin.CharSequence
@org.jetbrains.annotations.NotNull public abstract override /*1*/ fun foo(): kotlin.CharSequence
}
public interface Super {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt
Vendored
+1 -1
View File
@@ -9,6 +9,6 @@ public interface AddNullabilityJavaSubtype {
public interface Super {
public abstract fun dummy(): kotlin.Unit
@org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence
@org.jetbrains.annotations.NotNull public abstract fun foo(): kotlin.CharSequence
}
}
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt
Vendored
+1 -1
View File
@@ -9,6 +9,6 @@ public interface AddNullabilitySameJavaType {
public interface Super {
public abstract fun dummy(): kotlin.Unit
@org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence
@org.jetbrains.annotations.NotNull public abstract fun foo(): kotlin.CharSequence
}
}
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt
Vendored
+1 -1
View File
@@ -9,6 +9,6 @@ public interface InheritNullabilityJavaSubtype {
public interface Super {
public abstract fun dummy(): kotlin.Unit
@org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence
@org.jetbrains.annotations.NotNull public abstract fun foo(): kotlin.CharSequence
}
}
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt
Vendored
+1 -1
View File
@@ -9,6 +9,6 @@ public interface InheritNullabilitySameJavaType {
public interface Super {
public abstract fun dummy(): kotlin.Unit
@org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence
@org.jetbrains.annotations.NotNull public abstract fun foo(): kotlin.CharSequence
}
}
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
Vendored
+1 -1
View File
@@ -14,6 +14,6 @@ public interface TwoSuperclassesReturnJavaSubtype {
public interface Super2 {
public abstract fun dummy(): kotlin.Unit
@org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence
@org.jetbrains.annotations.NotNull public abstract fun foo(): kotlin.CharSequence
}
}
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
Vendored
+1 -1
View File
@@ -14,6 +14,6 @@ public interface TwoSuperclassesReturnSameJavaType {
public interface Super2 {
public abstract fun dummy(): kotlin.Unit
@org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence
@org.jetbrains.annotations.NotNull public abstract fun foo(): kotlin.CharSequence
}
}
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.txt
Vendored
+1 -1
View File
@@ -9,6 +9,6 @@ public interface TypeParamOfClass {
public interface Super</*0*/ T : kotlin.Any!> {
public abstract fun dummy(): kotlin.Unit
@org.jetbrains.annotations.NotNull() public abstract fun foo(): T
@org.jetbrains.annotations.NotNull public abstract fun foo(): T
}
}
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt
Vendored
+1 -1
View File
@@ -9,6 +9,6 @@ public interface TypeParamOfClassSubstituted {
public interface Super</*0*/ T : kotlin.Any!> {
public abstract fun dummy(): kotlin.Unit
@org.jetbrains.annotations.NotNull() public abstract fun foo(): T
@org.jetbrains.annotations.NotNull public abstract fun foo(): T
}
}
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.txt
Vendored
+1 -1
View File
@@ -9,6 +9,6 @@ public interface TypeParamOfFun {
public interface Super {
public abstract fun dummy(): kotlin.Unit
@org.jetbrains.annotations.NotNull() public abstract fun </*0*/ T : kotlin.Any!> foo(): T
@org.jetbrains.annotations.NotNull public abstract fun </*0*/ T : kotlin.Any!> foo(): T
}
}
compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ public open class ModalityOfFakeOverrides : java.util.AbstractList<kotlin.String
public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
@org.jetbrains.annotations.NotNull() public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
@org.jetbrains.annotations.NotNull public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String!): kotlin.Int
public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt
Vendored
+4 -4
View File
@@ -1,8 +1,8 @@
package test
public interface LoadIterable</*0*/ T : kotlin.Any!> {
@org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.MutableIterable<T!>!
@org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T!>!
public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() p0: kotlin.collections.MutableIterable<T!>!): kotlin.Unit
public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.collections.Iterable<T!>!): kotlin.Unit
@org.jetbrains.annotations.Mutable public abstract fun getIterable(): kotlin.collections.MutableIterable<T!>!
@org.jetbrains.annotations.ReadOnly public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T!>!
public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable p0: kotlin.collections.MutableIterable<T!>!): kotlin.Unit
public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly p0: kotlin.collections.Iterable<T!>!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
package test
public interface LoadIterableWithConflict</*0*/ T : kotlin.Any!> {
@org.jetbrains.annotations.ReadOnly() @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.(Mutable)Iterable<T!>!
public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() @org.jetbrains.annotations.Mutable() p0: kotlin.collections.(Mutable)Iterable<T!>!): kotlin.Unit
@org.jetbrains.annotations.ReadOnly @org.jetbrains.annotations.Mutable public abstract fun getIterable(): kotlin.collections.(Mutable)Iterable<T!>!
public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.ReadOnly @org.jetbrains.annotations.Mutable p0: kotlin.collections.(Mutable)Iterable<T!>!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt
Vendored
+4 -4
View File
@@ -1,8 +1,8 @@
package test
public interface LoadIterableWithNullability</*0*/ T : kotlin.Any!> {
@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.MutableIterable<T!>
@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T!>
public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() @org.jetbrains.annotations.NotNull() p0: kotlin.collections.MutableIterable<T!>): kotlin.Unit
public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() @org.jetbrains.annotations.NotNull() p0: kotlin.collections.Iterable<T!>): kotlin.Unit
@org.jetbrains.annotations.NotNull @org.jetbrains.annotations.Mutable public abstract fun getIterable(): kotlin.collections.MutableIterable<T!>
@org.jetbrains.annotations.NotNull @org.jetbrains.annotations.ReadOnly public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T!>
public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable @org.jetbrains.annotations.NotNull p0: kotlin.collections.MutableIterable<T!>): kotlin.Unit
public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly @org.jetbrains.annotations.NotNull p0: kotlin.collections.Iterable<T!>): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt
Vendored
+4 -4
View File
@@ -3,10 +3,10 @@ package test
public interface LoadIterableWithPropagation {
public interface LoadIterable</*0*/ T : kotlin.Any!> {
@org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.MutableIterable<T!>!
@org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T!>!
public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() p0: kotlin.collections.MutableIterable<T!>!): kotlin.Unit
public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.collections.Iterable<T!>!): kotlin.Unit
@org.jetbrains.annotations.Mutable public abstract fun getIterable(): kotlin.collections.MutableIterable<T!>!
@org.jetbrains.annotations.ReadOnly public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T!>!
public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable p0: kotlin.collections.MutableIterable<T!>!): kotlin.Unit
public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly p0: kotlin.collections.Iterable<T!>!): kotlin.Unit
}
public open class LoadIterableImpl</*0*/ T : kotlin.Any!> : test.LoadIterableWithPropagation.LoadIterable<T!> {
compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.txt
Vendored
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public interface ReadOnlyExtendsWildcard {
public abstract fun bar(): kotlin.Unit
public abstract fun foo(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.collections.List<kotlin.CharSequence!>!, /*1*/ @org.jetbrains.annotations.NotNull() p1: kotlin.Comparable<kotlin.String!>): kotlin.Unit
public abstract fun foo(/*0*/ @org.jetbrains.annotations.ReadOnly p0: kotlin.collections.List<kotlin.CharSequence!>!, /*1*/ @org.jetbrains.annotations.NotNull p1: kotlin.Comparable<kotlin.String!>): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/notNull/NotNullField.txt
Vendored
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class NotNullField {
public constructor NotNullField()
@org.jetbrains.annotations.NotNull() public final var hi: kotlin.String
@org.jetbrains.annotations.NotNull public final var hi: kotlin.String
}
compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.txt
Vendored
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class NotNullIntArray {
public constructor NotNullIntArray()
@org.jetbrains.annotations.NotNull() public open fun hi(): kotlin.IntArray
@org.jetbrains.annotations.NotNull public open fun hi(): kotlin.IntArray
}
compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.txt
Vendored
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class NotNullMethod {
public constructor NotNullMethod()
@org.jetbrains.annotations.NotNull() public open fun hi(): kotlin.String
@org.jetbrains.annotations.NotNull public open fun hi(): kotlin.String
}
compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.txt
Vendored
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class NotNullObjectArray {
public constructor NotNullObjectArray()
@org.jetbrains.annotations.NotNull() public open fun hi(): kotlin.Array<(out) kotlin.Any!>
@org.jetbrains.annotations.NotNull public open fun hi(): kotlin.Array<(out) kotlin.Any!>
}
compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.txt
Vendored
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class NotNullParameter {
public constructor NotNullParameter()
public open fun hi(/*0*/ @org.jetbrains.annotations.NotNull() p0: kotlin.String): kotlin.Unit
public open fun hi(/*0*/ @org.jetbrains.annotations.NotNull p0: kotlin.String): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
package test
public open class ConstructorWithAnnotations {
public /*synthesized*/ constructor ConstructorWithAnnotations(/*0*/ p0: (() -> kotlin.Unit)!, /*1*/ @org.jetbrains.annotations.NotNull() p1: kotlin.String)
public constructor ConstructorWithAnnotations(/*0*/ p0: java.lang.Runnable!, /*1*/ @org.jetbrains.annotations.NotNull() p1: kotlin.String)
public /*synthesized*/ constructor ConstructorWithAnnotations(/*0*/ p0: (() -> kotlin.Unit)!, /*1*/ @org.jetbrains.annotations.NotNull p1: kotlin.String)
public constructor ConstructorWithAnnotations(/*0*/ p0: java.lang.Runnable!, /*1*/ @org.jetbrains.annotations.NotNull p1: kotlin.String)
}