From 334ae82b041c9e5c01d9516474de68c56a7f82fd Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 11 Jan 2018 20:12:42 +0300 Subject: [PATCH] 172: Revert "UAST test data fixes: `@null` in render" This reverts commit 2f366b8209206b32792919f35f896fc63ad4b0e5. --- .../DefaultParameterValues.render.txt.172 | 2 +- .../testData/InnerClasses.render.txt.172 | 6 +++--- ...meterPropertyWithAnnotation.render.txt.172 | 12 +++++------ ...ParametersWithDefaultValues.render.txt.172 | 2 +- .../testData/SimpleScript.render.txt.172 | 10 +++++----- ...nexpectedContainerException.render.txt.172 | 20 +++++++++++++++++++ .../testData/WhenStringLiteral.render.txt.172 | 12 +++++------ 7 files changed, 42 insertions(+), 22 deletions(-) create mode 100644 plugins/uast-kotlin/testData/UnexpectedContainerException.render.txt.172 diff --git a/plugins/uast-kotlin/testData/DefaultParameterValues.render.txt.172 b/plugins/uast-kotlin/testData/DefaultParameterValues.render.txt.172 index 9ce163e3ad2..0d903ca6199 100644 --- a/plugins/uast-kotlin/testData/DefaultParameterValues.render.txt.172 +++ b/plugins/uast-kotlin/testData/DefaultParameterValues.render.txt.172 @@ -1,4 +1,4 @@ public final class DefaultParameterValuesKt { - public static final fun foo(@null a: int, @org.jetbrains.annotations.Nullable foo: java.lang.String) : void { + public static final fun foo(a: int, foo: java.lang.String) : void { } } diff --git a/plugins/uast-kotlin/testData/InnerClasses.render.txt.172 b/plugins/uast-kotlin/testData/InnerClasses.render.txt.172 index 8d5cfd523a0..b8f5db1b0e2 100644 --- a/plugins/uast-kotlin/testData/InnerClasses.render.txt.172 +++ b/plugins/uast-kotlin/testData/InnerClasses.render.txt.172 @@ -1,12 +1,12 @@ public final class Foo { public fun Foo() = UastEmptyExpression public static final class Bar { - @null private final var a: int - @null private final var b: int + private final var a: int + 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(@null a: int, @null b: int) = UastEmptyExpression + public fun Bar(a: int, b: int) = UastEmptyExpression public static final class Baz { public final fun doNothing() : void = Unit public fun Baz() = UastEmptyExpression diff --git a/plugins/uast-kotlin/testData/ParameterPropertyWithAnnotation.render.txt.172 b/plugins/uast-kotlin/testData/ParameterPropertyWithAnnotation.render.txt.172 index efd21da3642..19d3c2b5a8f 100644 --- a/plugins/uast-kotlin/testData/ParameterPropertyWithAnnotation.render.txt.172 +++ b/plugins/uast-kotlin/testData/ParameterPropertyWithAnnotation.render.txt.172 @@ -14,17 +14,17 @@ public abstract annotation MyAnnotation5 { } public final class Test1 { - @null private var bar: int + private var bar: int public final fun getBar() : int = UastEmptyExpression - public final fun setBar(@null p: int) : void = UastEmptyExpression - public fun Test1(@MyAnnotation @null bar: int) = UastEmptyExpression + public final fun setBar(p: int) : void = UastEmptyExpression + public fun Test1(bar: int) = UastEmptyExpression } public final class Test2 { - @MyAnnotation5 @null private var bar: int + private var bar: int @MyAnnotation public final fun getBar() : int = UastEmptyExpression @MyAnnotation2 - public final fun setBar(@MyAnnotation3 @null p: int) : void = UastEmptyExpression - public fun Test2(@null bar: int) = UastEmptyExpression + public final fun setBar(p: int) : void = UastEmptyExpression + public fun Test2(bar: int) = UastEmptyExpression } diff --git a/plugins/uast-kotlin/testData/ParametersWithDefaultValues.render.txt.172 b/plugins/uast-kotlin/testData/ParametersWithDefaultValues.render.txt.172 index febae6d0326..a47a36a47c3 100644 --- a/plugins/uast-kotlin/testData/ParametersWithDefaultValues.render.txt.172 +++ b/plugins/uast-kotlin/testData/ParametersWithDefaultValues.render.txt.172 @@ -1,4 +1,4 @@ public final class ParametersWithDefaultValuesKt { - public static final fun foo(@null a: int, @org.jetbrains.annotations.NotNull b: java.lang.String, @null c: int, @null flag: boolean) : void { + public static final fun foo(a: int, b: java.lang.String, c: int, flag: boolean) : void { } } diff --git a/plugins/uast-kotlin/testData/SimpleScript.render.txt.172 b/plugins/uast-kotlin/testData/SimpleScript.render.txt.172 index 892fe3dad7d..dcf6efc4a65 100644 --- a/plugins/uast-kotlin/testData/SimpleScript.render.txt.172 +++ b/plugins/uast-kotlin/testData/SimpleScript.render.txt.172 @@ -1,21 +1,21 @@ public class SimpleScript : kotlin.script.templates.standard.ScriptTemplateWithArgs { - public final fun getBarOrNull(@null flag: boolean) : SimpleScript.Bar { + public final fun getBarOrNull(flag: boolean) : SimpleScript.Bar { return if (flag) (42) else null } - public fun SimpleScript(@null p: java.lang.String[]) { + public fun SimpleScript(p: java.lang.String[]) { println("Hello World!") getBarOrNull(true) println("Goodbye World!") } public static final class Bar { - @null private final var b: int = 0 - @null private final var a: int + private final var b: int = 0 + private final var a: int public final fun getB() : int = UastEmptyExpression public final fun getAPlusB() : int { return a + b } public final fun getA() : int = UastEmptyExpression - public fun Bar(@null a: int) = UastEmptyExpression + public fun Bar(a: int) = UastEmptyExpression public static final class Baz { public final fun doSomething() : void { } diff --git a/plugins/uast-kotlin/testData/UnexpectedContainerException.render.txt.172 b/plugins/uast-kotlin/testData/UnexpectedContainerException.render.txt.172 new file mode 100644 index 00000000000..7c405437c1d --- /dev/null +++ b/plugins/uast-kotlin/testData/UnexpectedContainerException.render.txt.172 @@ -0,0 +1,20 @@ +public abstract interface Callback { + public abstract fun onError(throwable: java.lang.Throwable) : void = UastEmptyExpression +} + +public final class Model { + public final fun crashMe(clazz: java.lang.Class, factory: kotlin.jvm.functions.Function0) : void { + throw () + } + public fun Model() { + { + crashMe(Callback.java, { + anonymous object : Callback { + override fun onError(throwable: Throwable) { + throw UnsupportedOperationException("") + } + } + }) + } + } +} diff --git a/plugins/uast-kotlin/testData/WhenStringLiteral.render.txt.172 b/plugins/uast-kotlin/testData/WhenStringLiteral.render.txt.172 index 2992788c0d5..dba73b9ef0b 100644 --- a/plugins/uast-kotlin/testData/WhenStringLiteral.render.txt.172 +++ b/plugins/uast-kotlin/testData/WhenStringLiteral.render.txt.172 @@ -1,23 +1,23 @@ public final class WhenStringLiteralKt { - @org.jetbrains.annotations.Nullable private static final var a: java.lang.String = readLine() - @null private static final var b: int = switch (a) { + private static final var a: java.lang.String = readLine() + 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 () : void {