From c861b036a01088eee772002311b0b37ad89bc060 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Fri, 4 Sep 2015 22:37:23 +0300 Subject: [PATCH] fix tests in org.jetbrains.kotlin.idea.decompiler.textBuilder --- .../decompiledText/Annotations.expected.kt | 8 ++++---- .../AnnotationsOnPrimaryCtr.expected.kt | 5 ++--- .../ClassWithClassObject.expected.kt | 16 ++++++++-------- .../DependencyOnNestedClasses.expected.kt | 2 +- .../decompiler/decompiledText/Enum.expected.kt | 8 ++++---- .../decompiledText/FlexibleTypes.expected.kt | 8 ++++---- .../decompiledText/FunctionTypes.expected.kt | 2 +- .../decompiledText/Inherited.expected.kt | 4 ++-- .../decompiledText/NestedClasses.expected.kt | 18 +++++++++--------- .../decompiledText/Object.expected.kt | 12 ++++++------ .../SecondaryConstructors.expected.kt | 6 +++--- .../decompiledText/SimpleClass.expected.kt | 14 +++++++------- .../decompiledTextJs/TestPackage.expected.kt | 6 +++--- .../decompiledTextJvm/TestKt.expected.kt | 6 +++--- 14 files changed, 57 insertions(+), 58 deletions(-) diff --git a/idea/testData/decompiler/decompiledText/Annotations.expected.kt b/idea/testData/decompiler/decompiledText/Annotations.expected.kt index f17d24e8af8..93a46c82790 100644 --- a/idea/testData/decompiler/decompiledText/Annotations.expected.kt +++ b/idea/testData/decompiler/decompiledText/Annotations.expected.kt @@ -3,8 +3,8 @@ package test -kotlin.data dependency.A dependency.B dependency.C internal final class Annotations public constructor() { - kotlin.inline dependency.A dependency.B dependency.C internal final val p: @[dependency.B] kotlin.Int /* compiled code */ +kotlin.data dependency.A dependency.B dependency.C public final class Annotations public constructor() { + 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 */ } +} \ No newline at end of file diff --git a/idea/testData/decompiler/decompiledText/AnnotationsOnPrimaryCtr.expected.kt b/idea/testData/decompiler/decompiledText/AnnotationsOnPrimaryCtr.expected.kt index 7b32a40b2d0..e6a910aafe3 100644 --- a/idea/testData/decompiler/decompiledText/AnnotationsOnPrimaryCtr.expected.kt +++ b/idea/testData/decompiler/decompiledText/AnnotationsOnPrimaryCtr.expected.kt @@ -3,6 +3,5 @@ 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() { +} \ No newline at end of file diff --git a/idea/testData/decompiler/decompiledText/ClassWithClassObject.expected.kt b/idea/testData/decompiler/decompiledText/ClassWithClassObject.expected.kt index 9e9ac92bbe9..55b53aee112 100644 --- a/idea/testData/decompiler/decompiledText/ClassWithClassObject.expected.kt +++ b/idea/testData/decompiler/decompiledText/ClassWithClassObject.expected.kt @@ -3,22 +3,22 @@ package test -internal final class ClassWithClassObject public constructor() { +public final class ClassWithClassObject public constructor() { 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 */ - internal final val kotlin.Int.g: kotlin.Int /* compiled code */ + public final val kotlin.Int.g: kotlin.Int /* compiled code */ - internal final fun complexFun(a: T, b: K, c: G): G { /* compiled code */ } + public final fun 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 */ } - 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 */ } +} \ No newline at end of file diff --git a/idea/testData/decompiler/decompiledText/DependencyOnNestedClasses.expected.kt b/idea/testData/decompiler/decompiledText/DependencyOnNestedClasses.expected.kt index d99970cb57d..440e3112faa 100644 --- a/idea/testData/decompiler/decompiledText/DependencyOnNestedClasses.expected.kt +++ b/idea/testData/decompiler/decompiledText/DependencyOnNestedClasses.expected.kt @@ -4,5 +4,5 @@ package test 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 */ } } \ No newline at end of file diff --git a/idea/testData/decompiler/decompiledText/Enum.expected.kt b/idea/testData/decompiler/decompiledText/Enum.expected.kt index 312e5b73251..2a522f7f5b7 100644 --- a/idea/testData/decompiler/decompiledText/Enum.expected.kt +++ b/idea/testData/decompiler/decompiledText/Enum.expected.kt @@ -3,7 +3,7 @@ package test -internal final enum class Enum private constructor() : kotlin.Enum { +public final enum class Enum private constructor() : kotlin.Enum { A, B, @@ -17,8 +17,8 @@ internal final enum class Enum private constructor() : kotlin.Enum { F; 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 */ } +} \ No newline at end of file diff --git a/idea/testData/decompiler/decompiledText/FlexibleTypes.expected.kt b/idea/testData/decompiler/decompiledText/FlexibleTypes.expected.kt index 7438c283c71..d10a441b0f9 100644 --- a/idea/testData/decompiler/decompiledText/FlexibleTypes.expected.kt +++ b/idea/testData/decompiler/decompiledText/FlexibleTypes.expected.kt @@ -3,10 +3,10 @@ package test -internal abstract class FlexibleTypes public constructor() { - internal abstract val p: kotlin.Int /* platform type */ +public abstract class FlexibleTypes public constructor() { + public abstract val p: kotlin.Int /* platform type */ - internal abstract fun collection(): kotlin.List /* platform type */ + public abstract fun collection(): kotlin.List /* platform type */ - internal final fun withBody(): kotlin.Int /* platform type */ { /* compiled code */ } + public final fun withBody(): kotlin.Int /* platform type */ { /* compiled code */ } } \ No newline at end of file diff --git a/idea/testData/decompiler/decompiledText/FunctionTypes.expected.kt b/idea/testData/decompiler/decompiledText/FunctionTypes.expected.kt index 6b138f0dc77..921bef98414 100644 --- a/idea/testData/decompiler/decompiledText/FunctionTypes.expected.kt +++ b/idea/testData/decompiler/decompiledText/FunctionTypes.expected.kt @@ -3,7 +3,7 @@ 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 f2(f: kotlin.Function2): kotlin.Unit { /* compiled code */ } diff --git a/idea/testData/decompiler/decompiledText/Inherited.expected.kt b/idea/testData/decompiler/decompiledText/Inherited.expected.kt index b32621c7df2..0ae26593bb0 100644 --- a/idea/testData/decompiler/decompiledText/Inherited.expected.kt +++ b/idea/testData/decompiler/decompiledText/Inherited.expected.kt @@ -3,8 +3,8 @@ package test -internal interface Inherited : dependency.Base { +public interface Inherited : dependency.Base { public companion object { - internal final val INT_CONST: kotlin.Int /* compiled code */ + public final val INT_CONST: kotlin.Int /* compiled code */ } } \ No newline at end of file diff --git a/idea/testData/decompiler/decompiledText/NestedClasses.expected.kt b/idea/testData/decompiler/decompiledText/NestedClasses.expected.kt index 0cc8889c488..ccf74995c8c 100644 --- a/idea/testData/decompiler/decompiledText/NestedClasses.expected.kt +++ b/idea/testData/decompiler/decompiledText/NestedClasses.expected.kt @@ -3,26 +3,26 @@ package test -internal final class NestedClasses public constructor() { - internal final fun f(): kotlin.Unit { /* compiled code */ } +public final class NestedClasses public constructor() { + public final fun f(): kotlin.Unit { /* compiled code */ } 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() { - internal final fun f(): kotlin.Unit { /* compiled code */ } + public final fun f(): kotlin.Unit { /* compiled code */ } } } 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() { - internal final fun f(): kotlin.Unit { /* compiled code */ } + public final inner class NI public constructor() { + public final fun f(): kotlin.Unit { /* compiled code */ } } public final class NN public constructor() { - internal final fun f(): kotlin.Unit { /* compiled code */ } + public final fun f(): kotlin.Unit { /* compiled code */ } } } -} +} \ No newline at end of file diff --git a/idea/testData/decompiler/decompiledText/Object.expected.kt b/idea/testData/decompiler/decompiledText/Object.expected.kt index 1b82367657f..f5510e2a1cf 100644 --- a/idea/testData/decompiler/decompiledText/Object.expected.kt +++ b/idea/testData/decompiler/decompiledText/Object.expected.kt @@ -3,14 +3,14 @@ package test -internal object Object { - internal final val kotlin.Int.g: kotlin.Int /* compiled code */ +public object Object { + public final val kotlin.Int.g: kotlin.Int /* compiled code */ - internal final fun complexFun(a: T, b: K, c: G): G { /* compiled code */ } + public final fun 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 */ } - internal final fun kotlin.Int.f(): kotlin.Unit { /* compiled code */ } -} + public final fun kotlin.Int.f(): kotlin.Unit { /* compiled code */ } +} \ No newline at end of file diff --git a/idea/testData/decompiler/decompiledText/SecondaryConstructors.expected.kt b/idea/testData/decompiler/decompiledText/SecondaryConstructors.expected.kt index f9401f3ad94..d0e8e6f7c6b 100644 --- a/idea/testData/decompiler/decompiledText/SecondaryConstructors.expected.kt +++ b/idea/testData/decompiler/decompiledText/SecondaryConstructors.expected.kt @@ -3,16 +3,16 @@ 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 */ } private constructor(x: kotlin.Int) { /* compiled code */ } - internal final inner class Inner where G : kotlin.Number { + public final inner class Inner where G : kotlin.Number { 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 */ } internal constructor() { /* compiled code */ } diff --git a/idea/testData/decompiler/decompiledText/SimpleClass.expected.kt b/idea/testData/decompiler/decompiledText/SimpleClass.expected.kt index bd578a68558..27696577878 100644 --- a/idea/testData/decompiler/decompiledText/SimpleClass.expected.kt +++ b/idea/testData/decompiler/decompiledText/SimpleClass.expected.kt @@ -3,20 +3,20 @@ package test -internal abstract class SimpleClass public constructor() : dependency.D, dependency.Tr, kotlin.List { - internal final val a: dependency.A /* compiled code */ +public abstract class SimpleClass public constructor() : dependency.D, dependency.Tr, kotlin.List { + public final val a: dependency.A /* 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 complexFun(a: T, b: K, c: G): G { /* compiled code */ } + public final fun 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.List> { /* compiled code */ } + public final fun g(d: dependency.D): kotlin.List> { /* 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 */ } } \ No newline at end of file diff --git a/idea/testData/decompiler/decompiledTextJs/TestPackage.expected.kt b/idea/testData/decompiler/decompiledTextJs/TestPackage.expected.kt index a9b14e7ec61..b830cc58f70 100644 --- a/idea/testData/decompiler/decompiledTextJs/TestPackage.expected.kt +++ b/idea/testData/decompiler/decompiledTextJs/TestPackage.expected.kt @@ -5,8 +5,8 @@ package test 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 */ } \ No newline at end of file +public fun kotlin.Int.plus(i: kotlin.Int /* = compiled code */): kotlin.Int { /* compiled code */ } \ No newline at end of file diff --git a/idea/testData/decompiler/decompiledTextJvm/TestKt.expected.kt b/idea/testData/decompiler/decompiledTextJvm/TestKt.expected.kt index e80fc500d32..140cba728b4 100644 --- a/idea/testData/decompiler/decompiledTextJvm/TestKt.expected.kt +++ b/idea/testData/decompiler/decompiledTextJvm/TestKt.expected.kt @@ -5,8 +5,8 @@ package test 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 */ }