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

Do not generate @NotNull annotations on void- or primitive-returning methods

Browse Source 
#KT-4834 Fixed
  #KT-5255 Fixed
This commit is contained in:
Andrey Breslav
2014-06-21 15:08:43 +04:00
parent b6aff9e9ee
commit 38d4ca5469
27 changed files with 136 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java
-4
View File
@@ -34,7 +34,6 @@ public final class Class implements kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.Nullable
public final java.lang.String getNullableVar() { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public final void setNullableVar(@org.jetbrains.annotations.Nullable @jet.runtime.typeinfo.JetValueParameter(name = "<set-?>", type = "?") java.lang.String p) { /* compiled code */ }
@org.jetbrains.annotations.NotNull
@@ -43,7 +42,6 @@ public final class Class implements kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.NotNull
public final java.lang.String getNotNullVar() { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public final void setNotNullVar(@org.jetbrains.annotations.NotNull @jet.runtime.typeinfo.JetValueParameter(name = "<set-?>") java.lang.String p) { /* compiled code */ }
@org.jetbrains.annotations.Nullable
@@ -55,7 +53,6 @@ public final class Class implements kotlin.jvm.internal.KObject {
public final java.lang.String getNotNullVarWithGetSet() { /* compiled code */ }
@org.jetbrains.annotations.Nullable
@org.jetbrains.annotations.NotNull
public final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull @jet.runtime.typeinfo.JetValueParameter(name = "v") java.lang.String v) { /* compiled code */ }
@org.jetbrains.annotations.NotNull
@@ -69,6 +66,5 @@ public final class Class implements kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.NotNull
public final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable @jet.runtime.typeinfo.JetValueParameter(name = "v", type = "?") java.lang.String v) { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public Class() { /* compiled code */ }
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java
-1
View File
@@ -4,7 +4,6 @@ public final class ClassObjectField implements kotlin.jvm.internal.KObject {
private static final java.lang.String y = "";
public static final ClassObjectField.object object$;
@org.jetbrains.annotations.NotNull
public ClassObjectField() { /* compiled code */ }
public static final class object implements kotlin.jvm.internal.KObject {
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.java
-1
View File
@@ -1,4 +1,3 @@
public final class ClassWithConstructor implements kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.NotNull
public ClassWithConstructor(@org.jetbrains.annotations.Nullable @jet.runtime.typeinfo.JetValueParameter(name = "nullable", type = "?") java.lang.String nullable, @org.jetbrains.annotations.NotNull @jet.runtime.typeinfo.JetValueParameter(name = "notNull") java.lang.String notNull) { /* compiled code */ }
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java
-1
View File
@@ -10,6 +10,5 @@ public final class ClassWithConstructorAndProperties implements kotlin.jvm.inter
@org.jetbrains.annotations.NotNull
public final java.lang.String getNotNull() { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public ClassWithConstructorAndProperties(@org.jetbrains.annotations.Nullable @jet.runtime.typeinfo.JetValueParameter(name = "nullable", type = "?") java.lang.String nullable, @org.jetbrains.annotations.NotNull @jet.runtime.typeinfo.JetValueParameter(name = "notNull") java.lang.String notNull) { /* compiled code */ }
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.java
+11
View File
@@ -0,0 +1,11 @@
public final class C implements kotlin.jvm.internal.KObject, Tr {
private final int v = 1;
@org.jetbrains.annotations.NotNull
public java.lang.Integer foo() { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public java.lang.Integer getV() { /* compiled code */ }
public C() { /* compiled code */ }
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt
+12
View File
@@ -0,0 +1,12 @@
// C
trait Tr {
fun foo(): Any
val v: Any
}
class C: Tr {
override fun foo() = 1
override val v = 1
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.java
+4
View File
@@ -0,0 +1,4 @@
public final class _DefaultPackage {
@org.jetbrains.annotations.Nullable
public static final kotlin.Unit foo() { /* compiled code */ }
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt
+3
View File
@@ -0,0 +1,3 @@
// _DefaultPackage
fun foo(): Unit? = null
compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.java
+5
View File
@@ -0,0 +1,5 @@
public final class C implements kotlin.jvm.internal.KObject, Base {
public void foo() { /* compiled code */ }
public C() { /* compiled code */ }
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt
+9
View File
@@ -0,0 +1,9 @@
// C
trait Base {
fun foo(): Any
}
class C : Base {
override fun foo(): Unit {}
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.java
-3
View File
@@ -1,14 +1,11 @@
public final class Synthetic implements kotlin.jvm.internal.KObject {
private final void foo() { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public Synthetic() { /* compiled code */ }
public final class Inner implements kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.NotNull
public final void test() { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public Inner() { /* compiled code */ }
}
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java
-2
View File
@@ -25,7 +25,6 @@ public interface Trait extends kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.Nullable
java.lang.String getNullableVar();
@org.jetbrains.annotations.NotNull
void setNullableVar(@org.jetbrains.annotations.Nullable @jet.runtime.typeinfo.JetValueParameter(name = "<set-?>", type = "?") java.lang.String p);
@org.jetbrains.annotations.NotNull
@@ -34,6 +33,5 @@ public interface Trait extends kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.NotNull
java.lang.String getNotNullVar();
@org.jetbrains.annotations.NotNull
void setNotNullVar(@org.jetbrains.annotations.NotNull @jet.runtime.typeinfo.JetValueParameter(name = "<set-?>") java.lang.String p);
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.java
+5
View File
@@ -0,0 +1,5 @@
public final class C implements kotlin.jvm.internal.KObject, Base<kotlin.Unit> {
public void foo(@org.jetbrains.annotations.NotNull @jet.runtime.typeinfo.JetValueParameter(name = "t") kotlin.Unit t) { /* compiled code */ }
public C() { /* compiled code */ }
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt
+9
View File
@@ -0,0 +1,9 @@
// C
trait Base<T> {
fun foo(t: T): T
}
class C : Base<Unit> {
override fun foo(t: Unit) {}
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.java
+3
View File
@@ -0,0 +1,3 @@
public final class _DefaultPackage {
public static final void foo(@org.jetbrains.annotations.NotNull @jet.runtime.typeinfo.JetValueParameter(name = "s") kotlin.Unit s) { /* compiled code */ }
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt
+3
View File
@@ -0,0 +1,3 @@
// _DefaultPackage
fun foo(s: Unit) {}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.java
+3
View File
@@ -0,0 +1,3 @@
public final class _DefaultPackage {
public static final void foo(@org.jetbrains.annotations.NotNull @jet.runtime.typeinfo.JetValueParameter(name = "s") java.lang.String s) { /* compiled code */ }
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt
+3
View File
@@ -0,0 +1,3 @@
// _DefaultPackage
fun foo(s: String) {}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.java
-3
View File
@@ -9,7 +9,6 @@ public final class _DefaultPackage {
@org.jetbrains.annotations.NotNull
public static final java.lang.String getNotNullVar() { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public static final void setNotNullVar(@org.jetbrains.annotations.NotNull @jet.runtime.typeinfo.JetValueParameter(name = "<set-?>") java.lang.String p) { /* compiled code */ }
@org.jetbrains.annotations.Nullable
@@ -17,7 +16,6 @@ public final class _DefaultPackage {
public static final java.lang.String getNotNullVarWithGetSet() { /* compiled code */ }
@org.jetbrains.annotations.Nullable
@org.jetbrains.annotations.NotNull
public static final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull @jet.runtime.typeinfo.JetValueParameter(name = "v") java.lang.String v) { /* compiled code */ }
@org.jetbrains.annotations.Nullable
@@ -30,7 +28,6 @@ public final class _DefaultPackage {
@org.jetbrains.annotations.Nullable
public static final java.lang.String getNullableVar() { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public static final void setNullableVar(@org.jetbrains.annotations.Nullable @jet.runtime.typeinfo.JetValueParameter(name = "<set-?>", type = "?") java.lang.String p) { /* compiled code */ }
@org.jetbrains.annotations.NotNull