UAST test data fixes: @null in render

as a "nullability" annotation for primitive types
This commit is contained in:
Nicolay Mitropolsky
2017-10-11 20:36:47 +03:00
committed by Nikolay Krasko
parent 9fed8f1d24
commit 7c3c59de00
7 changed files with 25 additions and 25 deletions
@@ -1,4 +1,4 @@
public final class DefaultParameterValuesKt {
public static final fun foo(a: int, foo: java.lang.String) : void {
public static final fun foo(@null a: int, @org.jetbrains.annotations.Nullable foo: java.lang.String) : void {
}
}
+3 -3
View File
@@ -1,12 +1,12 @@
public final class Foo {
public fun Foo() = UastEmptyExpression
public static final class Bar {
private final var a: int
private final var b: int
@null private final var a: int
@null private final var b: int
public final fun getAPlusB() : int = a + b
public final fun getA() : int = UastEmptyExpression
public final fun getB() : int = UastEmptyExpression
public fun Bar(a: int, b: int) = UastEmptyExpression
public fun Bar(@null a: int, @null b: int) = UastEmptyExpression
public static final class Baz {
public final fun doNothing() : void = Unit
public fun Baz() = UastEmptyExpression
@@ -14,17 +14,17 @@ public abstract annotation MyAnnotation5 {
}
public final class Test1 {
private var bar: int
@null private var bar: int
public final fun getBar() : int = UastEmptyExpression
public final fun setBar(p: int) : void = UastEmptyExpression
public fun Test1(bar: int) = UastEmptyExpression
public final fun setBar(@null p: int) : void = UastEmptyExpression
public fun Test1(@MyAnnotation @null bar: int) = UastEmptyExpression
}
public final class Test2 {
private var bar: int
@MyAnnotation5 @null private var bar: int
@MyAnnotation
public final fun getBar() : int = UastEmptyExpression
@MyAnnotation2
public final fun setBar(p: int) : void = UastEmptyExpression
public fun Test2(bar: int) = UastEmptyExpression
public final fun setBar(@MyAnnotation3 @null p: int) : void = UastEmptyExpression
public fun Test2(@null bar: int) = UastEmptyExpression
}
@@ -1,4 +1,4 @@
public final class ParametersWithDefaultValuesKt {
public static final fun foo(a: int, b: java.lang.String, c: int, flag: boolean) : void {
public static final fun foo(@null a: int, @org.jetbrains.annotations.NotNull b: java.lang.String, @null c: int, @null flag: boolean) : void {
}
}
+5 -5
View File
@@ -1,19 +1,19 @@
public class SimpleScript : kotlin.script.templates.standard.ScriptTemplateWithArgs {
public final fun getBarOrNull(flag: boolean) : SimpleScript.Bar {
public final fun getBarOrNull(@null flag: boolean) : SimpleScript.Bar {
return if (flag) <init>(42) else null
}
public fun SimpleScript(p: java.lang.String[]) {
public fun SimpleScript(@null p: java.lang.String[]) {
println("Hello World!")
getBarOrNull(true)
println("Goodbye World!")
}
public static final class Bar {
private final var b: int = 0
private final var a: int
@null private final var b: int = 0
@null private final var a: int
public final fun getB() : int = UastEmptyExpression
public final fun getAPlusB() : int = a + b
public final fun getA() : int = UastEmptyExpression
public fun Bar(a: int) = UastEmptyExpression
public fun Bar(@null a: int) = UastEmptyExpression
public static final class Baz {
public final fun doSomething() : void {
}
@@ -1,14 +1,14 @@
public abstract interface Callback {
public abstract fun onError(throwable: java.lang.Throwable) : void = UastEmptyExpression
public abstract fun onError(@org.jetbrains.annotations.NotNull throwable: java.lang.Throwable) : void = UastEmptyExpression
}
public final class Model {
public final fun crashMe(clazz: java.lang.Class<T>, factory: kotlin.jvm.functions.Function0<? extends T>) : void {
public final fun crashMe(@org.jetbrains.annotations.NotNull clazz: java.lang.Class<T>, @org.jetbrains.annotations.NotNull factory: kotlin.jvm.functions.Function0<? extends T>) : void {
throw <init>()
}
public fun Model() {
{
crashMe(Callback.java, {
crashMe(Callback.java, {
anonymous object : Callback {
override fun onError(throwable: Throwable) {
throw UnsupportedOperationException("")
+6 -6
View File
@@ -1,23 +1,23 @@
public final class WhenStringLiteralKt {
private static final var a: java.lang.String = readLine()
private static final var b: int = switch (a) {
@org.jetbrains.annotations.Nullable private static final var a: java.lang.String = readLine()
@null private static final var b: int = switch (a) {
"abc" -> {
1
break
}
"def", "ghi" -> {
2
break
}
-> {
3
break
}
}
public static final fun getA() : java.lang.String = UastEmptyExpression
public static final fun getB() : int = UastEmptyExpression
public static final fun <no name provided>() : void {