fix tests in org.jetbrains.kotlin.idea.decompiler.textBuilder

This commit is contained in:
Michael Nedzelsky
2015-09-04 22:37:23 +03:00
parent a119a6bbeb
commit c861b036a0
14 changed files with 57 additions and 58 deletions
@@ -3,8 +3,8 @@
package test package test
kotlin.data dependency.A dependency.B dependency.C internal final class Annotations public constructor() { kotlin.data dependency.A dependency.B dependency.C public final class Annotations public constructor() {
kotlin.inline dependency.A dependency.B dependency.C internal final val p: @[dependency.B] kotlin.Int /* compiled code */ kotlin.inline dependency.A dependency.B dependency.C public final val p: @[dependency.B] kotlin.Int /* compiled code */
kotlin.inline dependency.A dependency.B dependency.C internal final fun f(dependency.A dependency.B dependency.C kotlin.Deprecated i: @[dependency.A] kotlin.Int): kotlin.Unit { /* compiled code */ } kotlin.inline dependency.A dependency.B dependency.C public final fun f(dependency.A dependency.B dependency.C kotlin.Deprecated i: @[dependency.A] kotlin.Int): kotlin.Unit { /* compiled code */ }
} }
@@ -3,6 +3,5 @@
package test package test
internal final class AnnotationsOnPrimaryCtr @[dependency.A dependency.B dependency.C] private constructor() { public final class AnnotationsOnPrimaryCtr @[dependency.A dependency.B dependency.C] private constructor() {
} }
@@ -3,22 +3,22 @@
package test package test
internal final class ClassWithClassObject public constructor() { public final class ClassWithClassObject public constructor() {
public companion object { public companion object {
internal final val a: test.A /* compiled code */ public final val a: test.A /* compiled code */
public final var b: test.B /* compiled code */ public final var b: test.B /* compiled code */
internal final val kotlin.Int.g: kotlin.Int /* compiled code */ public final val kotlin.Int.g: kotlin.Int /* compiled code */
internal final fun <T, K, G> complexFun(a: T, b: K, c: G): G { /* compiled code */ } public final fun <T, K, G> complexFun(a: T, b: K, c: G): G { /* compiled code */ }
internal final fun f(): kotlin.Unit { /* compiled code */ } public final fun f(): kotlin.Unit { /* compiled code */ }
private final fun privateFun(): kotlin.Unit { /* compiled code */ } private final fun privateFun(): kotlin.Unit { /* compiled code */ }
internal final fun kotlin.Int.f(): kotlin.Unit { /* compiled code */ } public final fun kotlin.Int.f(): kotlin.Unit { /* compiled code */ }
} }
internal final fun f(): kotlin.Unit { /* compiled code */ } public final fun f(): kotlin.Unit { /* compiled code */ }
} }
@@ -4,5 +4,5 @@
package test package test
public final class DependencyOnNestedClasses public constructor() : dependency.D.Nested { public final class DependencyOnNestedClasses public constructor() : dependency.D.Nested {
internal final fun f(nc: dependency.D.Companion.NestedInClassObject, i: dependency.D.Inner, ii: dependency.D.Inner.Inner, nn: dependency.D.Nested.Nested): dependency.D.Nested { /* compiled code */ } public final fun f(nc: dependency.D.Companion.NestedInClassObject, i: dependency.D.Inner, ii: dependency.D.Inner.Inner, nn: dependency.D.Nested.Nested): dependency.D.Nested { /* compiled code */ }
} }
+4 -4
View File
@@ -3,7 +3,7 @@
package test package test
internal final enum class Enum private constructor() : kotlin.Enum<test.Enum> { public final enum class Enum private constructor() : kotlin.Enum<test.Enum> {
A, A,
B, B,
@@ -17,8 +17,8 @@ internal final enum class Enum private constructor() : kotlin.Enum<test.Enum> {
F; F;
public companion object { public companion object {
internal final val c: kotlin.Int /* compiled code */ public final val c: kotlin.Int /* compiled code */
} }
internal open fun f(): kotlin.Int { /* compiled code */ } public open fun f(): kotlin.Int { /* compiled code */ }
} }
@@ -3,10 +3,10 @@
package test package test
internal abstract class FlexibleTypes public constructor() { public abstract class FlexibleTypes public constructor() {
internal abstract val p: kotlin.Int /* platform type */ public abstract val p: kotlin.Int /* platform type */
internal abstract fun collection(): kotlin.List<kotlin.Int> /* platform type */ public abstract fun collection(): kotlin.List<kotlin.Int> /* platform type */
internal final fun withBody(): kotlin.Int /* platform type */ { /* compiled code */ } public final fun withBody(): kotlin.Int /* platform type */ { /* compiled code */ }
} }
@@ -3,7 +3,7 @@
package test package test
internal final class FunctionTypes public constructor() { public final class FunctionTypes public constructor() {
public final fun f1(f: kotlin.Function1<*, *>): kotlin.Unit { /* compiled code */ } public final fun f1(f: kotlin.Function1<*, *>): kotlin.Unit { /* compiled code */ }
public final fun f2(f: kotlin.Function2<kotlin.Int, *, kotlin.String>): kotlin.Unit { /* compiled code */ } public final fun f2(f: kotlin.Function2<kotlin.Int, *, kotlin.String>): kotlin.Unit { /* compiled code */ }
@@ -3,8 +3,8 @@
package test package test
internal interface Inherited : dependency.Base { public interface Inherited : dependency.Base {
public companion object { public companion object {
internal final val INT_CONST: kotlin.Int /* compiled code */ public final val INT_CONST: kotlin.Int /* compiled code */
} }
} }
@@ -3,26 +3,26 @@
package test package test
internal final class NestedClasses public constructor() { public final class NestedClasses public constructor() {
internal final fun f(): kotlin.Unit { /* compiled code */ } public final fun f(): kotlin.Unit { /* compiled code */ }
public final inner class Inner public constructor() { public final inner class Inner public constructor() {
internal final fun f(): kotlin.Unit { /* compiled code */ } public final fun f(): kotlin.Unit { /* compiled code */ }
private final inner class II public constructor() { private final inner class II public constructor() {
internal final fun f(): kotlin.Unit { /* compiled code */ } public final fun f(): kotlin.Unit { /* compiled code */ }
} }
} }
private final class Nested public constructor() { private final class Nested public constructor() {
internal final fun f(): kotlin.Unit { /* compiled code */ } public final fun f(): kotlin.Unit { /* compiled code */ }
internal final inner class NI public constructor() { public final inner class NI public constructor() {
internal final fun f(): kotlin.Unit { /* compiled code */ } public final fun f(): kotlin.Unit { /* compiled code */ }
} }
public final class NN public constructor() { public final class NN public constructor() {
internal final fun f(): kotlin.Unit { /* compiled code */ } public final fun f(): kotlin.Unit { /* compiled code */ }
} }
} }
} }
+6 -6
View File
@@ -3,14 +3,14 @@
package test package test
internal object Object { public object Object {
internal final val kotlin.Int.g: kotlin.Int /* compiled code */ public final val kotlin.Int.g: kotlin.Int /* compiled code */
internal final fun <T, K, G> complexFun(a: T, b: K, c: G): G { /* compiled code */ } public final fun <T, K, G> complexFun(a: T, b: K, c: G): G { /* compiled code */ }
internal final fun f(): kotlin.Unit { /* compiled code */ } public final fun f(): kotlin.Unit { /* compiled code */ }
private final fun privateFun(): kotlin.Unit { /* compiled code */ } private final fun privateFun(): kotlin.Unit { /* compiled code */ }
internal final fun kotlin.Int.f(): kotlin.Unit { /* compiled code */ } public final fun kotlin.Int.f(): kotlin.Unit { /* compiled code */ }
} }
@@ -3,16 +3,16 @@
package test package test
internal final class SecondaryConstructors public constructor(x: kotlin.Boolean) { public final class SecondaryConstructors public constructor(x: kotlin.Boolean) {
test.anno public constructor(x: kotlin.String) { /* compiled code */ } test.anno public constructor(x: kotlin.String) { /* compiled code */ }
private constructor(x: kotlin.Int) { /* compiled code */ } private constructor(x: kotlin.Int) { /* compiled code */ }
internal final inner class Inner<T : kotlin.String, G : kotlin.Int> where G : kotlin.Number { public final inner class Inner<T : kotlin.String, G : kotlin.Int> where G : kotlin.Number {
public constructor(x: T, g: G) { /* compiled code */ } public constructor(x: T, g: G) { /* compiled code */ }
} }
internal final class Nested { public final class Nested {
test.anno public constructor(z: kotlin.Int) { /* compiled code */ } test.anno public constructor(z: kotlin.Int) { /* compiled code */ }
internal constructor() { /* compiled code */ } internal constructor() { /* compiled code */ }
@@ -3,20 +3,20 @@
package test package test
internal abstract class SimpleClass public constructor() : dependency.D<dependency.Tr, kotlin.Int>, dependency.Tr, kotlin.List<kotlin.String> { public abstract class SimpleClass public constructor() : dependency.D<dependency.Tr, kotlin.Int>, dependency.Tr, kotlin.List<kotlin.String> {
internal final val a: dependency.A /* compiled code */ public final val a: dependency.A /* compiled code */
public final var b: dependency.B /* compiled code */ public final var b: dependency.B /* compiled code */
internal final val kotlin.Int.g: kotlin.Int /* compiled code */ public final val kotlin.Int.g: kotlin.Int /* compiled code */
internal final fun <T, K, G> complexFun(a: T, b: K, c: G): G { /* compiled code */ } public final fun <T, K, G> complexFun(a: T, b: K, c: G): G { /* compiled code */ }
internal final fun f(): kotlin.Unit { /* compiled code */ } public final fun f(): kotlin.Unit { /* compiled code */ }
internal final fun g(d: dependency.D<kotlin.String, dependency.Tr>): kotlin.List<dependency.D<dependency.A, kotlin.Int>> { /* compiled code */ } public final fun g(d: dependency.D<kotlin.String, dependency.Tr>): kotlin.List<dependency.D<dependency.A, kotlin.Int>> { /* compiled code */ }
private final fun privateFun(): kotlin.Unit { /* compiled code */ } private final fun privateFun(): kotlin.Unit { /* compiled code */ }
internal final fun kotlin.Int.f(): kotlin.Unit { /* compiled code */ } public final fun kotlin.Int.f(): kotlin.Unit { /* compiled code */ }
} }
@@ -5,8 +5,8 @@ package test
private var i: kotlin.Int /* compiled code */ private var i: kotlin.Int /* compiled code */
internal val p: kotlin.Int /* compiled code */ public val p: kotlin.Int /* compiled code */
internal fun f(): kotlin.Unit { /* compiled code */ } public fun f(): kotlin.Unit { /* compiled code */ }
internal fun kotlin.Int.plus(i: kotlin.Int /* = compiled code */): kotlin.Int { /* compiled code */ } public fun kotlin.Int.plus(i: kotlin.Int /* = compiled code */): kotlin.Int { /* compiled code */ }
@@ -5,8 +5,8 @@ package test
private var i: kotlin.Int /* compiled code */ private var i: kotlin.Int /* compiled code */
internal val p: kotlin.Int /* compiled code */ public val p: kotlin.Int /* compiled code */
internal fun f(): kotlin.Unit { /* compiled code */ } public fun f(): kotlin.Unit { /* compiled code */ }
internal fun kotlin.Int.plus(i: kotlin.Int /* = compiled code */): kotlin.Int { /* compiled code */ } public fun kotlin.Int.plus(i: kotlin.Int /* = compiled code */): kotlin.Int { /* compiled code */ }