jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-05-08 15:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Java declaration annotations are treated as type annotations

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.txt
View File

@@ -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
}
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.txt
View File

@@ -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 {

2
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt
View File

@@ -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
}
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt
View File

@@ -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 {

2
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
View File

@@ -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!> {

2
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
View File

@@ -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 {

2
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
View File

@@ -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 {

2
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt
View File

@@ -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!
}
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt
View File

@@ -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!
}
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt
View File

@@ -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!
}
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt
View File

@@ -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!
}
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
View File

@@ -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!
}
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
View File

@@ -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!
}
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.txt
View File

@@ -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!
}
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt
View File

@@ -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!
}
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.txt
View File

@@ -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!
}
}