From d943079557ad4c06dfadcd53617ce9e30b23c858 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 12 Aug 2016 20:09:27 +0300 Subject: [PATCH] Exception typealiases rendering in test output --- .../compileJavaAgainstKotlin/method/throws/ClassMembers.txt | 4 ++-- .../compileJavaAgainstKotlin/method/throws/Constructor.txt | 4 ++-- .../compileJavaAgainstKotlin/method/throws/DefaultArgs.txt | 2 +- .../compileJavaAgainstKotlin/method/throws/Delegation.txt | 4 ++-- .../method/throws/GenericSubstitution.txt | 2 +- .../compileJavaAgainstKotlin/method/throws/TopLevel.txt | 4 ++-- .../compileJavaAgainstKotlin/method/throws/TraitMembers.txt | 4 ++-- .../diagnostics/tests/controlStructures/catchGenerics.txt | 4 ++-- .../diagnostics/tests/dataFlowInfoTraversal/Throw.txt | 2 +- compiler/testData/diagnostics/tests/regressions/kt498.txt | 2 +- .../tests/smartCasts/varnotnull/initInTryReturnInCatch.txt | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.txt b/compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.txt index 9240ec8dbc3..02426ba67a9 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.txt +++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.txt @@ -1,6 +1,6 @@ package test -public final class E1 : java.lang.Exception { +public final class E1 : kotlin.Exception /* = java.lang.Exception */ { public constructor E1() public open /*fake_override*/ val cause: kotlin.Throwable? public open /*fake_override*/ val message: kotlin.String? @@ -16,7 +16,7 @@ public final class E1 : java.lang.Exception { public open /*fake_override*/ fun setStackTrace(/*0*/ kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit } -public final class E2 : java.lang.Exception { +public final class E2 : kotlin.Exception /* = java.lang.Exception */ { public constructor E2() public open /*fake_override*/ val cause: kotlin.Throwable? public open /*fake_override*/ val message: kotlin.String? diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.txt b/compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.txt index c471a2b03fb..41b4ba4ad4b 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.txt +++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.txt @@ -1,6 +1,6 @@ package test -public final class E1 : java.lang.Exception { +public final class E1 : kotlin.Exception /* = java.lang.Exception */ { public constructor E1() public open /*fake_override*/ val cause: kotlin.Throwable? public open /*fake_override*/ val message: kotlin.String? @@ -16,7 +16,7 @@ public final class E1 : java.lang.Exception { public open /*fake_override*/ fun setStackTrace(/*0*/ kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit } -public final class E2 : java.lang.Exception { +public final class E2 : kotlin.Exception /* = java.lang.Exception */ { public constructor E2() public open /*fake_override*/ val cause: kotlin.Throwable? public open /*fake_override*/ val message: kotlin.String? diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.txt b/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.txt index e98df835fe8..fe215049136 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.txt +++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.txt @@ -2,7 +2,7 @@ package test @kotlin.jvm.JvmOverloads() public fun one(/*0*/ kotlin.Int = ...): kotlin.Unit -public final class E1 : java.lang.Exception { +public final class E1 : kotlin.Exception /* = java.lang.Exception */ { public constructor E1() public open /*fake_override*/ val cause: kotlin.Throwable? public open /*fake_override*/ val message: kotlin.String? diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.txt b/compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.txt index b829c601a55..3886b9d7358 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.txt +++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.txt @@ -1,6 +1,6 @@ package test -public final class E1 : java.lang.Exception { +public final class E1 : kotlin.Exception /* = java.lang.Exception */ { public constructor E1() public open /*fake_override*/ val cause: kotlin.Throwable? public open /*fake_override*/ val message: kotlin.String? @@ -16,7 +16,7 @@ public final class E1 : java.lang.Exception { public open /*fake_override*/ fun setStackTrace(/*0*/ kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit } -public final class E2 : java.lang.Exception { +public final class E2 : kotlin.Exception /* = java.lang.Exception */ { public constructor E2() public open /*fake_override*/ val cause: kotlin.Throwable? public open /*fake_override*/ val message: kotlin.String? diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.txt b/compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.txt index 029cea4cd5f..23b385d85db 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.txt +++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.txt @@ -9,7 +9,7 @@ public final class Derived : test.Base { public open /*fake_override*/ fun one(/*0*/ kotlin.String): kotlin.Unit } -public final class E1 : java.lang.Exception { +public final class E1 : kotlin.Exception /* = java.lang.Exception */ { public constructor E1() public open /*fake_override*/ val cause: kotlin.Throwable? public open /*fake_override*/ val message: kotlin.String? diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.txt b/compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.txt index a4bf328e175..cd18ff46937 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.txt +++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.txt @@ -4,7 +4,7 @@ public fun none(): kotlin.Unit public fun one(): kotlin.Unit public fun two(): kotlin.Unit -public final class E1 : java.lang.Exception { +public final class E1 : kotlin.Exception /* = java.lang.Exception */ { public constructor E1() public open /*fake_override*/ val cause: kotlin.Throwable? public open /*fake_override*/ val message: kotlin.String? @@ -20,7 +20,7 @@ public final class E1 : java.lang.Exception { public open /*fake_override*/ fun setStackTrace(/*0*/ kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit } -public final class E2 : java.lang.Exception { +public final class E2 : kotlin.Exception /* = java.lang.Exception */ { public constructor E2() public open /*fake_override*/ val cause: kotlin.Throwable? public open /*fake_override*/ val message: kotlin.String? diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.txt b/compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.txt index c7aa2c436c2..2c9b40b2082 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.txt +++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.txt @@ -1,6 +1,6 @@ package test -public final class E1 : java.lang.Exception { +public final class E1 : kotlin.Exception /* = java.lang.Exception */ { public constructor E1() public open /*fake_override*/ val cause: kotlin.Throwable? public open /*fake_override*/ val message: kotlin.String? @@ -16,7 +16,7 @@ public final class E1 : java.lang.Exception { public open /*fake_override*/ fun setStackTrace(/*0*/ kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit } -public final class E2 : java.lang.Exception { +public final class E2 : kotlin.Exception /* = java.lang.Exception */ { public constructor E2() public open /*fake_override*/ val cause: kotlin.Throwable? public open /*fake_override*/ val message: kotlin.String? diff --git a/compiler/testData/diagnostics/tests/controlStructures/catchGenerics.txt b/compiler/testData/diagnostics/tests/controlStructures/catchGenerics.txt index 3c80c459b66..7c7c0d59380 100644 --- a/compiler/testData/diagnostics/tests/controlStructures/catchGenerics.txt +++ b/compiler/testData/diagnostics/tests/controlStructures/catchGenerics.txt @@ -1,7 +1,7 @@ package public fun bar(): kotlin.Unit -public inline fun tryCatch(/*0*/ lazy: () -> R, /*1*/ failure: (E) -> R): R +public inline fun tryCatch(/*0*/ lazy: () -> R, /*1*/ failure: (E) -> R): R public final class XException : kotlin.Throwable { public constructor XException(/*0*/ p: T) @@ -43,7 +43,7 @@ public final class YException : java.lang.RuntimeException { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -public final class ZException : java.lang.Exception { +public final class ZException : kotlin.Exception /* = java.lang.Exception */ { public constructor ZException(/*0*/ p: T) public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable? public open override /*1*/ /*fake_override*/ val message: kotlin.String? diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.txt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.txt index 94647e4bd2f..3266474d694 100644 --- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.txt +++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.txt @@ -1,4 +1,4 @@ package -public fun bar(/*0*/ x: kotlin.Int): java.lang.RuntimeException +public fun bar(/*0*/ x: kotlin.Int): kotlin.RuntimeException /* = java.lang.RuntimeException */ public fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/regressions/kt498.txt b/compiler/testData/diagnostics/tests/regressions/kt498.txt index 2b549e44f95..9c2c69eac96 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt498.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt498.txt @@ -2,7 +2,7 @@ package public fun T.getJavaClass(): java.lang.Class -public final class IdUnavailableException : java.lang.Exception { +public final class IdUnavailableException : kotlin.Exception /* = java.lang.Exception */ { public constructor IdUnavailableException() public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable? public open override /*1*/ /*fake_override*/ val message: kotlin.String? diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.txt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.txt index 7f9a15220ad..0f77ad98508 100644 --- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.txt +++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.txt @@ -7,7 +7,7 @@ public fun test4(): kotlin.Unit public fun test5(): kotlin.Unit public fun test6(): kotlin.Unit -public final class A : java.lang.Exception { +public final class A : kotlin.Exception /* = java.lang.Exception */ { public constructor A() public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable? public open override /*1*/ /*fake_override*/ val message: kotlin.String? @@ -26,7 +26,7 @@ public final class A : java.lang.Exception { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -public final class B : java.lang.Exception { +public final class B : kotlin.Exception /* = java.lang.Exception */ { public constructor B() public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable? public open override /*1*/ /*fake_override*/ val message: kotlin.String?