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

Don't generate ValueParameter annotations in light class mode

Browse Source
This commit is contained in:
Nikolay Krasko
2014-09-19 20:43:39 +04:00
parent 432ec31daf
commit f5ee68064f
15 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java
+6 -6
View File
@@ -9,10 +9,10 @@ public final class Class implements kotlin.jvm.internal.KObject {
private java.lang.String notNullVar;
@org.jetbrains.annotations.NotNull
public final java.lang.String notNull(@jet.runtime.typeinfo.JetValueParameter(name = "a") @org.jetbrains.annotations.NotNull java.lang.String a) { /* compiled code */ }
public final java.lang.String notNull(@org.jetbrains.annotations.NotNull java.lang.String a) { /* compiled code */ }
@org.jetbrains.annotations.Nullable
public final java.lang.String nullable(@jet.runtime.typeinfo.JetValueParameter(name = "a", type = "?") @org.jetbrains.annotations.Nullable java.lang.String a) { /* compiled code */ }
public final java.lang.String nullable(@org.jetbrains.annotations.Nullable java.lang.String a) { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public final java.lang.String notNullWithNN() { /* compiled code */ }
@@ -34,7 +34,7 @@ public final class Class implements kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.Nullable
public final java.lang.String getNullableVar() { /* compiled code */ }
public final void setNullableVar(@jet.runtime.typeinfo.JetValueParameter(name = "<set-?>", type = "?") @org.jetbrains.annotations.Nullable java.lang.String p) { /* compiled code */ }
public final void setNullableVar(@org.jetbrains.annotations.Nullable java.lang.String p) { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public final java.lang.String getNotNullVal() { /* compiled code */ }
@@ -42,7 +42,7 @@ public final class Class implements kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.NotNull
public final java.lang.String getNotNullVar() { /* compiled code */ }
public final void setNotNullVar(@jet.runtime.typeinfo.JetValueParameter(name = "<set-?>") @org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ }
public final void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ }
@org.jetbrains.annotations.Nullable
@org.jetbrains.annotations.NotNull
@@ -53,7 +53,7 @@ public final class Class implements kotlin.jvm.internal.KObject {
public final java.lang.String getNotNullVarWithGetSet() { /* compiled code */ }
@org.jetbrains.annotations.Nullable
public final void setNotNullVarWithGetSet(@jet.runtime.typeinfo.JetValueParameter(name = "v") @org.jetbrains.annotations.NotNull java.lang.String v) { /* compiled code */ }
public final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull java.lang.String v) { /* compiled code */ }
@org.jetbrains.annotations.NotNull
@org.jetbrains.annotations.Nullable
@@ -64,7 +64,7 @@ public final class Class implements kotlin.jvm.internal.KObject {
public final java.lang.String getNullableVarWithGetSet() { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public final void setNullableVarWithGetSet(@jet.runtime.typeinfo.JetValueParameter(name = "v", type = "?") @org.jetbrains.annotations.Nullable java.lang.String v) { /* compiled code */ }
public final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable java.lang.String v) { /* compiled code */ }
public Class() { /* compiled code */ }
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.java
+1 -1
View File
@@ -1,3 +1,3 @@
public final class ClassWithConstructor implements kotlin.jvm.internal.KObject {
public ClassWithConstructor(@jet.runtime.typeinfo.JetValueParameter(name = "nullable", type = "?") @org.jetbrains.annotations.Nullable java.lang.String nullable, @jet.runtime.typeinfo.JetValueParameter(name = "notNull") @org.jetbrains.annotations.NotNull java.lang.String notNull) { /* compiled code */ }
public ClassWithConstructor(@org.jetbrains.annotations.Nullable java.lang.String nullable, @org.jetbrains.annotations.NotNull java.lang.String notNull) { /* compiled code */ }
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java
+1 -1
View File
@@ -10,5 +10,5 @@ public final class ClassWithConstructorAndProperties implements kotlin.jvm.inter
@org.jetbrains.annotations.NotNull
public final java.lang.String getNotNull() { /* compiled code */ }
public ClassWithConstructorAndProperties(@jet.runtime.typeinfo.JetValueParameter(name = "nullable", type = "?") @org.jetbrains.annotations.Nullable java.lang.String nullable, @jet.runtime.typeinfo.JetValueParameter(name = "notNull") @org.jetbrains.annotations.NotNull java.lang.String notNull) { /* compiled code */ }
public ClassWithConstructorAndProperties(@org.jetbrains.annotations.Nullable java.lang.String nullable, @org.jetbrains.annotations.NotNull java.lang.String notNull) { /* compiled code */ }
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java
+4 -4
View File
@@ -1,12 +1,12 @@
public interface Generic <N, NN> {
N a(@jet.runtime.typeinfo.JetValueParameter(name = "n") N n);
N a(N n);
@org.jetbrains.annotations.NotNull
NN b(@jet.runtime.typeinfo.JetValueParameter(name = "nn") @org.jetbrains.annotations.NotNull NN nn);
NN b(@org.jetbrains.annotations.NotNull NN nn);
@org.jetbrains.annotations.Nullable
N a1(@jet.runtime.typeinfo.JetValueParameter(name = "n", type = "?") @org.jetbrains.annotations.Nullable N n);
N a1(@org.jetbrains.annotations.Nullable N n);
@org.jetbrains.annotations.Nullable
NN b1(@jet.runtime.typeinfo.JetValueParameter(name = "nn", type = "?") @org.jetbrains.annotations.Nullable NN nn);
NN b1(@org.jetbrains.annotations.Nullable NN nn);
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java
+1 -1
View File
@@ -1,5 +1,5 @@
public interface Primitives {
int $$int /* Real name is 'int' */(@jet.runtime.typeinfo.JetValueParameter(name = "x") int x);
int $$int /* Real name is 'int' */(int x);
@org.jetbrains.annotations.Nullable
java.lang.Boolean getNullableBool();
compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.java
+3 -3
View File
@@ -1,11 +1,11 @@
public final class PrivateInClass implements kotlin.jvm.internal.KObject {
private final java.lang.String getNn() { /* compiled code */ }
private final void setNn(@jet.runtime.typeinfo.JetValueParameter(name = "value") java.lang.String value) { /* compiled code */ }
private final void setNn(java.lang.String value) { /* compiled code */ }
private final java.lang.String getN() { /* compiled code */ }
private final java.lang.String bar(@jet.runtime.typeinfo.JetValueParameter(name = "a") java.lang.String a, @jet.runtime.typeinfo.JetValueParameter(name = "b", type = "?") java.lang.String b) { /* compiled code */ }
private final java.lang.String bar(java.lang.String a, java.lang.String b) { /* compiled code */ }
private PrivateInClass(@jet.runtime.typeinfo.JetValueParameter(name = "s", type = "?") java.lang.String s) { /* compiled code */ }
private PrivateInClass(java.lang.String s) { /* compiled code */ }
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.java
+2 -2
View File
@@ -2,11 +2,11 @@ public interface PrivateInTrait {
@org.jetbrains.annotations.NotNull
java.lang.String getNn();
void setNn(@jet.runtime.typeinfo.JetValueParameter(name = "value") @org.jetbrains.annotations.NotNull java.lang.String value);
void setNn(@org.jetbrains.annotations.NotNull java.lang.String value);
@org.jetbrains.annotations.Nullable
java.lang.String getN();
@org.jetbrains.annotations.Nullable
java.lang.String bar(@jet.runtime.typeinfo.JetValueParameter(name = "a") @org.jetbrains.annotations.NotNull java.lang.String a, @jet.runtime.typeinfo.JetValueParameter(name = "b", type = "?") @org.jetbrains.annotations.Nullable java.lang.String b);
java.lang.String bar(@org.jetbrains.annotations.NotNull java.lang.String a, @org.jetbrains.annotations.Nullable java.lang.String b);
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java
+4 -4
View File
@@ -1,9 +1,9 @@
public interface Trait {
@org.jetbrains.annotations.NotNull
java.lang.String notNull(@jet.runtime.typeinfo.JetValueParameter(name = "a") @org.jetbrains.annotations.NotNull java.lang.String a);
java.lang.String notNull(@org.jetbrains.annotations.NotNull java.lang.String a);
@org.jetbrains.annotations.Nullable
java.lang.String nullable(@jet.runtime.typeinfo.JetValueParameter(name = "a", type = "?") @org.jetbrains.annotations.Nullable java.lang.String a);
java.lang.String nullable(@org.jetbrains.annotations.Nullable java.lang.String a);
@org.jetbrains.annotations.NotNull
java.lang.String notNullWithNN();
@@ -25,7 +25,7 @@ public interface Trait {
@org.jetbrains.annotations.Nullable
java.lang.String getNullableVar();
void setNullableVar(@jet.runtime.typeinfo.JetValueParameter(name = "<set-?>", type = "?") @org.jetbrains.annotations.Nullable java.lang.String p);
void setNullableVar(@org.jetbrains.annotations.Nullable java.lang.String p);
@org.jetbrains.annotations.NotNull
java.lang.String getNotNullVal();
@@ -33,5 +33,5 @@ public interface Trait {
@org.jetbrains.annotations.NotNull
java.lang.String getNotNullVar();
void setNotNullVar(@jet.runtime.typeinfo.JetValueParameter(name = "<set-?>") @org.jetbrains.annotations.NotNull java.lang.String p);
void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p);
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.java
+1 -1
View File
@@ -1,5 +1,5 @@
public final class C implements kotlin.jvm.internal.KObject, Base<kotlin.Unit> {
public void foo(@jet.runtime.typeinfo.JetValueParameter(name = "t") @org.jetbrains.annotations.NotNull kotlin.Unit t) { /* compiled code */ }
public void foo(@org.jetbrains.annotations.NotNull kotlin.Unit t) { /* compiled code */ }
public C() { /* compiled code */ }
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.java
+1 -1
View File
@@ -1,3 +1,3 @@
public final class _DefaultPackage {
public static final void foo(@jet.runtime.typeinfo.JetValueParameter(name = "s") @org.jetbrains.annotations.NotNull kotlin.Unit s) { /* compiled code */ }
public static final void foo(@org.jetbrains.annotations.NotNull kotlin.Unit s) { /* compiled code */ }
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.java
+1 -1
View File
@@ -1,3 +1,3 @@
public final class _DefaultPackage {
public static final void foo(@jet.runtime.typeinfo.JetValueParameter(name = "s") @org.jetbrains.annotations.NotNull java.lang.String s) { /* compiled code */ }
public static final void foo(@org.jetbrains.annotations.NotNull java.lang.String s) { /* compiled code */ }
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.java
+7 -7
View File
@@ -9,14 +9,14 @@ public final class _DefaultPackage {
@org.jetbrains.annotations.NotNull
public static final java.lang.String getNotNullVar() { /* compiled code */ }
public static final void setNotNullVar(@jet.runtime.typeinfo.JetValueParameter(name = "<set-?>") @org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ }
public static final void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ }
@org.jetbrains.annotations.Nullable
@org.jetbrains.annotations.NotNull
public static final java.lang.String getNotNullVarWithGetSet() { /* compiled code */ }
@org.jetbrains.annotations.Nullable
public static final void setNotNullVarWithGetSet(@jet.runtime.typeinfo.JetValueParameter(name = "v") @org.jetbrains.annotations.NotNull java.lang.String v) { /* compiled code */ }
public static final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull java.lang.String v) { /* compiled code */ }
@org.jetbrains.annotations.Nullable
public static final java.lang.String getNullableVal() { /* compiled code */ }
@@ -28,14 +28,14 @@ public final class _DefaultPackage {
@org.jetbrains.annotations.Nullable
public static final java.lang.String getNullableVar() { /* compiled code */ }
public static final void setNullableVar(@jet.runtime.typeinfo.JetValueParameter(name = "<set-?>", type = "?") @org.jetbrains.annotations.Nullable java.lang.String p) { /* compiled code */ }
public static final void setNullableVar(@org.jetbrains.annotations.Nullable java.lang.String p) { /* compiled code */ }
@org.jetbrains.annotations.NotNull
@org.jetbrains.annotations.Nullable
public static final java.lang.String getNullableVarWithGetSet() { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public static final void setNullableVarWithGetSet(@jet.runtime.typeinfo.JetValueParameter(name = "v", type = "?") @org.jetbrains.annotations.Nullable java.lang.String v) { /* compiled code */ }
public static final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable java.lang.String v) { /* compiled code */ }
@org.jetbrains.annotations.Nullable
public static final java.lang.String getPrivateN() { /* compiled code */ }
@@ -44,7 +44,7 @@ public final class _DefaultPackage {
public static final java.lang.String getPrivateNn() { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public static final java.lang.String notNull(@jet.runtime.typeinfo.JetValueParameter(name = "a") @org.jetbrains.annotations.NotNull java.lang.String a) { /* compiled code */ }
public static final java.lang.String notNull(@org.jetbrains.annotations.NotNull java.lang.String a) { /* compiled code */ }
@org.jetbrains.annotations.Nullable
@org.jetbrains.annotations.NotNull
@@ -54,7 +54,7 @@ public final class _DefaultPackage {
public static final java.lang.String notNullWithNN() { /* compiled code */ }
@org.jetbrains.annotations.Nullable
public static final java.lang.String nullable(@jet.runtime.typeinfo.JetValueParameter(name = "a", type = "?") @org.jetbrains.annotations.Nullable java.lang.String a) { /* compiled code */ }
public static final java.lang.String nullable(@org.jetbrains.annotations.Nullable java.lang.String a) { /* compiled code */ }
@org.jetbrains.annotations.Nullable
public static final java.lang.String nullableWithN() { /* compiled code */ }
@@ -64,5 +64,5 @@ public final class _DefaultPackage {
public static final java.lang.String nullableWithNN() { /* compiled code */ }
@org.jetbrains.annotations.Nullable
public static final java.lang.String privateFun(@jet.runtime.typeinfo.JetValueParameter(name = "a") @org.jetbrains.annotations.NotNull java.lang.String a, @jet.runtime.typeinfo.JetValueParameter(name = "b", type = "?") @org.jetbrains.annotations.Nullable java.lang.String b) { /* compiled code */ }
public static final java.lang.String privateFun(@org.jetbrains.annotations.NotNull java.lang.String a, @org.jetbrains.annotations.Nullable java.lang.String b) { /* compiled code */ }
}