Java declaration annotations are treated as type annotations

This is needed, for example, to approximate flexible types correctly when rendering them in the code
This commit is contained in:
Andrey Breslav
2014-09-17 14:25:00 +04:00
parent bd21e487fc
commit 91b0b83ec3
33 changed files with 119 additions and 64 deletions
@@ -9,6 +9,6 @@ public trait InheritNullability {
public trait Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit
public abstract fun foo(/*0*/ org.jetbrains.annotations.NotNull() p0: kotlin.String!): kotlin.Unit
}
}
@@ -4,7 +4,7 @@ public trait Kt3302 {
public trait BSONObject {
public abstract fun dummy(): kotlin.Unit
public abstract fun put(/*0*/ p0: kotlin.String!, /*1*/ 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 trait BasicBSONObject : test.Kt3302.LinkedHashMap<kotlin.String!, kotlin.Any!>, test.Kt3302.BSONObject {
@@ -9,6 +9,6 @@ public trait NotNullToNullable {
public trait Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit
public abstract fun foo(/*0*/ org.jetbrains.annotations.NotNull() p0: kotlin.String!): kotlin.Unit
}
}
@@ -4,7 +4,7 @@ public trait NullableToNotNull {
public trait Sub : test.NullableToNotNull.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ org.jetbrains.annotations.NotNull() p0: kotlin.String!): kotlin.Unit
}
public trait Super {
@@ -9,7 +9,7 @@ public trait SubclassFromGenericAndNot {
public trait NonGeneric {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit
public abstract fun foo(/*0*/ org.jetbrains.annotations.NotNull() p0: kotlin.String!): kotlin.Unit
}
public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String!> {
@@ -4,7 +4,7 @@ public trait AddNotNullJavaSubtype {
public trait Sub : test.AddNotNullJavaSubtype.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.String!
org.jetbrains.annotations.NotNull() public abstract override /*1*/ fun foo(): kotlin.String!
}
public trait Super {
@@ -4,7 +4,7 @@ public trait AddNotNullSameJavaType {
public trait Sub : test.AddNotNullSameJavaType.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.CharSequence!
org.jetbrains.annotations.NotNull() public abstract override /*1*/ fun foo(): kotlin.CharSequence!
}
public trait Super {
@@ -9,6 +9,6 @@ public trait AddNullabilityJavaSubtype {
public trait Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.CharSequence!
org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence!
}
}
@@ -9,6 +9,6 @@ public trait AddNullabilitySameJavaType {
public trait Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.CharSequence!
org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence!
}
}
@@ -9,6 +9,6 @@ public trait InheritNullabilityJavaSubtype {
public trait Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.CharSequence!
org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence!
}
}
@@ -9,6 +9,6 @@ public trait InheritNullabilitySameJavaType {
public trait Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.CharSequence!
org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence!
}
}
@@ -14,6 +14,6 @@ public trait TwoSuperclassesReturnJavaSubtype {
public trait Super2 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.CharSequence!
org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence!
}
}
@@ -14,6 +14,6 @@ public trait TwoSuperclassesReturnSameJavaType {
public trait Super2 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.CharSequence!
org.jetbrains.annotations.NotNull() public abstract fun foo(): kotlin.CharSequence!
}
}
@@ -9,6 +9,6 @@ public trait TypeParamOfClass {
public trait Super</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): T!
org.jetbrains.annotations.NotNull() public abstract fun foo(): T!
}
}
@@ -9,6 +9,6 @@ public trait TypeParamOfClassSubstituted {
public trait Super</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): T!
org.jetbrains.annotations.NotNull() public abstract fun foo(): T!
}
}
@@ -9,6 +9,6 @@ public trait TypeParamOfFun {
public trait Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun </*0*/ T> foo(): T!
org.jetbrains.annotations.NotNull() public abstract fun </*0*/ T> foo(): T!
}
}
@@ -10,7 +10,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*/ o: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean
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*/ o: kotlin.Any!): kotlin.Int
public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.(Mutable)Iterator<kotlin.String!>!
@@ -1,8 +1,8 @@
package test
public trait LoadIterableWithNullability</*0*/ T> {
org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.(Mutable)Iterable<T!>!
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
org.jetbrains.annotations.NotNull() org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
org.jetbrains.annotations.NotNull() org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.(Mutable)Iterable<T!>!
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() org.jetbrains.annotations.NotNull() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.NotNull() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
}
@@ -2,5 +2,5 @@ package test
public open class NotNullField {
public constructor NotNullField()
public final var hi: kotlin.String!
org.jetbrains.annotations.NotNull() public final var hi: kotlin.String!
}
@@ -2,5 +2,5 @@ package test
public open class NotNullIntArray {
public constructor NotNullIntArray()
public open fun hi(): kotlin.IntArray!
org.jetbrains.annotations.NotNull() public open fun hi(): kotlin.IntArray!
}
@@ -2,5 +2,5 @@ package test
public open class NotNullMethod {
public constructor NotNullMethod()
public open fun hi(): kotlin.String!
org.jetbrains.annotations.NotNull() public open fun hi(): kotlin.String!
}
@@ -2,5 +2,5 @@ package test
public open class NotNullObjectArray {
public constructor NotNullObjectArray()
public open fun hi(): kotlin.Array<(out) kotlin.Any!>!
org.jetbrains.annotations.NotNull() public open fun hi(): kotlin.Array<(out) kotlin.Any!>!
}
@@ -2,5 +2,5 @@ package test
public open class NotNullParameter {
public constructor NotNullParameter()
public open fun hi(/*0*/ p0: kotlin.String!): kotlin.Unit
public open fun hi(/*0*/ org.jetbrains.annotations.NotNull() p0: kotlin.String!): kotlin.Unit
}