diff --git a/compiler/testData/cli/warnings.kt b/compiler/testData/cli/warnings.kt index 0c84ed3b416..ad276976b28 100644 --- a/compiler/testData/cli/warnings.kt +++ b/compiler/testData/cli/warnings.kt @@ -1,5 +1,5 @@ -import jet.Any -import jet.Any +import kotlin.Any +import kotlin.Any fun foo(p: Int??) { diff --git a/compiler/testData/codegen/box/callableReference/toString.kt b/compiler/testData/codegen/box/callableReference/toString.kt index f36150769ff..a004bc8ff86 100644 --- a/compiler/testData/codegen/box/callableReference/toString.kt +++ b/compiler/testData/codegen/box/callableReference/toString.kt @@ -9,7 +9,7 @@ fun A.baz() {} fun box(): String { val f = "${::foo}" - if (f != "kotlin.reflect.KFunctionImpl1") return "Fail foo: $f" + if (f != "kotlin.reflect.KFunctionImpl1") return "Fail foo: $f" val nameOfA = (A() as java.lang.Object).getClass().getName() @@ -17,7 +17,7 @@ fun box(): String { if (g != "kotlin.reflect.KMemberFunctionImpl0<$nameOfA, java.lang.String>") return "Fail bar: $g" val h = "${A::baz}" - if (h != "kotlin.reflect.KExtensionFunctionImpl0<$nameOfA, jet.Unit>") return "Fail baz: $h" + if (h != "kotlin.reflect.KExtensionFunctionImpl0<$nameOfA, kotlin.Unit>") return "Fail baz: $h" return "OK" } diff --git a/compiler/testData/codegen/box/classes/kt1535.kt b/compiler/testData/codegen/box/classes/kt1535.kt index c93ff8f7ab3..b50e44824f7 100644 --- a/compiler/testData/codegen/box/classes/kt1535.kt +++ b/compiler/testData/codegen/box/classes/kt1535.kt @@ -1,9 +1,9 @@ -class Works() : jet.Function0 { +class Works() : Function0 { public override fun invoke():Object { return "Works" as Object } } -class Broken() : jet.Function0 { +class Broken() : Function0 { public override fun invoke():String { return "Broken" } diff --git a/compiler/testData/codegen/box/controlStructures/emptyFor.kt b/compiler/testData/codegen/box/controlStructures/emptyFor.kt index 834d5d83c2a..fc3f6332871 100644 --- a/compiler/testData/codegen/box/controlStructures/emptyFor.kt +++ b/compiler/testData/codegen/box/controlStructures/emptyFor.kt @@ -1,6 +1,10 @@ var index = 0 -val iterator = object : Iterator { +trait IterableIterator : Iterator { + fun iterator(): Iterator = this +} + +val iterator = object : IterableIterator { override fun hasNext() = index < 5 override fun next() = index++ } diff --git a/compiler/testData/codegen/box/functions/functionNtoString.kt b/compiler/testData/codegen/box/functions/functionNtoString.kt index 20c04c58b13..3bf89dd8225 100644 --- a/compiler/testData/codegen/box/functions/functionNtoString.kt +++ b/compiler/testData/codegen/box/functions/functionNtoString.kt @@ -6,22 +6,22 @@ fun check(expected: String, obj: Any?) { fun box(): String { - check("kotlin.FunctionImpl0") + check("kotlin.FunctionImpl0") { () : Unit -> } check("kotlin.FunctionImpl0") { () : Int -> 42 } check("kotlin.FunctionImpl1") { (s: String) : Long -> 42.toLong() } - check("kotlin.FunctionImpl2") + check("kotlin.FunctionImpl2") { (x: Int, y: Int) : Unit -> } - check("kotlin.ExtensionFunctionImpl0") + check("kotlin.ExtensionFunctionImpl0") { Int.() : Unit -> } - check("kotlin.ExtensionFunctionImpl0") + check("kotlin.ExtensionFunctionImpl0") { Unit.() : Int -> 42 } check("kotlin.ExtensionFunctionImpl1") { String.(s: String) : Long -> 42.toLong() } - check("kotlin.ExtensionFunctionImpl2") + check("kotlin.ExtensionFunctionImpl2") { Int.(x: Int, y: Int) : Unit -> } return "OK" diff --git a/compiler/testData/codegen/box/functions/invoke/kt3190.kt b/compiler/testData/codegen/box/functions/invoke/kt3190.kt index b0eb6d488be..c8558942a69 100644 --- a/compiler/testData/codegen/box/functions/invoke/kt3190.kt +++ b/compiler/testData/codegen/box/functions/invoke/kt3190.kt @@ -5,7 +5,7 @@ fun box(): String { return if (test(1) == 3) "OK" else "fail" } -class Cached(private val generate: (K)->V): jet.Function1 { +class Cached(private val generate: (K)->V): Function1 { val store = java.util.HashMap() // Everything works just fine if 'invoke' method is renamed to, for example, 'get' diff --git a/compiler/testData/codegen/box/reflection/functionLiteralGenericSignature.kt b/compiler/testData/codegen/box/reflection/functionLiteralGenericSignature.kt index c22b8fa4bce..73cc8114b41 100644 --- a/compiler/testData/codegen/box/reflection/functionLiteralGenericSignature.kt +++ b/compiler/testData/codegen/box/reflection/functionLiteralGenericSignature.kt @@ -19,14 +19,14 @@ val extensionFun = { Any.() : Unit -> } val extensionWithArgFun = { Long.(x: Any) : Date -> Date() } fun box(): String { - assertGenericSuper("kotlin.FunctionImpl0", unitFun) + assertGenericSuper("kotlin.FunctionImpl0", unitFun) assertGenericSuper("kotlin.FunctionImpl0", intFun) - assertGenericSuper("kotlin.FunctionImpl1", stringParamFun) + assertGenericSuper("kotlin.FunctionImpl1", stringParamFun) assertGenericSuper("kotlin.FunctionImpl1, java.util.List>", listFun) assertGenericSuper("kotlin.FunctionImpl1, java.util.List>", mutableListFun) - assertGenericSuper("kotlin.FunctionImpl1, jet.Unit>", funWithIn) + assertGenericSuper("kotlin.FunctionImpl1, kotlin.Unit>", funWithIn) - assertGenericSuper("kotlin.ExtensionFunctionImpl0", extensionFun) + assertGenericSuper("kotlin.ExtensionFunctionImpl0", extensionFun) assertGenericSuper("kotlin.ExtensionFunctionImpl1", extensionWithArgFun) return "OK" diff --git a/compiler/testData/codegen/box/typeMapping/kt3976.kt b/compiler/testData/codegen/box/typeMapping/kt3976.kt index 0b662314f96..f80506d6ca4 100644 --- a/compiler/testData/codegen/box/typeMapping/kt3976.kt +++ b/compiler/testData/codegen/box/typeMapping/kt3976.kt @@ -2,11 +2,11 @@ var currentAccountId: Int? by SessionAccessor() class SessionAccessor { - fun get(o : Nothing?, desc: jet.PropertyMetadata): T { + fun get(o : Nothing?, desc: PropertyMetadata): T { return null as T } - fun set(o : Nothing?, desc: jet.PropertyMetadata, value: T) { + fun set(o : Nothing?, desc: PropertyMetadata, value: T) { } } diff --git a/compiler/testData/codegen/boxWithJava/functions/unrelatedUpperBounds.kt b/compiler/testData/codegen/boxWithJava/functions/unrelatedUpperBounds.kt index 3bd2a24f1cb..e7d0d2f1b10 100644 --- a/compiler/testData/codegen/boxWithJava/functions/unrelatedUpperBounds.kt +++ b/compiler/testData/codegen/boxWithJava/functions/unrelatedUpperBounds.kt @@ -1,3 +1,3 @@ fun box(): String { - return unrelatedUpperBounds.id("OK" as java.lang.String)!! as jet.String + return unrelatedUpperBounds.id("OK" as java.lang.String)!! as kotlin.String } diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/inheritedOverriddenAdapter.java b/compiler/testData/codegen/boxWithJava/sam/adapters/inheritedOverriddenAdapter.java index 811b88e37d6..a5b02a1a406 100644 --- a/compiler/testData/codegen/boxWithJava/sam/adapters/inheritedOverriddenAdapter.java +++ b/compiler/testData/codegen/boxWithJava/sam/adapters/inheritedOverriddenAdapter.java @@ -7,7 +7,7 @@ class Super { } class Sub extends Super { - void foo(jet.Function0 r) { + void foo(kotlin.Function0 r) { lastCalled = "sub"; } } diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt533.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt533.kt index d123fed270b..bb8312260b1 100644 --- a/compiler/testData/codegen/boxWithStdlib/regressions/kt533.kt +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt533.kt @@ -95,8 +95,8 @@ fun LinkedList.sum(f : (Int, Int) -> Int) : Int { } fun List.backwards() : Iterable = object : Iterable { - override fun iterator() : jet.Iterator = - object : jet.Iterator { + override fun iterator() : Iterator = + object : Iterator { var current = size() override fun next() : T = get(--current) override fun hasNext() : Boolean = current > 0 diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/typeCastException.kt b/compiler/testData/codegen/boxWithStdlib/regressions/typeCastException.kt index e798dc710d5..e67ff8472d5 100644 --- a/compiler/testData/codegen/boxWithStdlib/regressions/typeCastException.kt +++ b/compiler/testData/codegen/boxWithStdlib/regressions/typeCastException.kt @@ -5,8 +5,8 @@ fun box(): String { val a: Any? = null a as Array } - catch(e: TypeCastException) { - if (e.getMessage() == "jet.Any? cannot be cast to jet.Array") { + catch (e: TypeCastException) { + if (e.getMessage() == "kotlin.Any? cannot be cast to kotlin.Array") { return "OK" } } diff --git a/compiler/testData/codegen/script/parameter.ktscript b/compiler/testData/codegen/script/parameter.ktscript index daada5e463f..30f08cf456d 100644 --- a/compiler/testData/codegen/script/parameter.ktscript +++ b/compiler/testData/codegen/script/parameter.ktscript @@ -1,5 +1,5 @@ // expected: rv: sky color is blue -// param: what: jet.String: sky -// param: color: jet.String: blue +// param: what: kotlin.String: sky +// param: color: kotlin.String: blue "$what color is $color" diff --git a/compiler/testData/codegen/script/parameterArray.ktscript b/compiler/testData/codegen/script/parameterArray.ktscript index 6e180c33101..a55ec42328b 100644 --- a/compiler/testData/codegen/script/parameterArray.ktscript +++ b/compiler/testData/codegen/script/parameterArray.ktscript @@ -1,4 +1,4 @@ -// param: args: jet.Array: three little words +// param: args: kotlin.Array: three little words // expected: rv: little args[1] diff --git a/compiler/testData/codegen/script/parameterClosure.ktscript b/compiler/testData/codegen/script/parameterClosure.ktscript index 896e82c2a4a..535ef0632fd 100644 --- a/compiler/testData/codegen/script/parameterClosure.ktscript +++ b/compiler/testData/codegen/script/parameterClosure.ktscript @@ -1,4 +1,4 @@ -// param: x: jet.Int: 10 +// param: x: kotlin.Int: 10 fun addX(y: Int) = x + y diff --git a/compiler/testData/codegen/script/parameterLong.ktscript b/compiler/testData/codegen/script/parameterLong.ktscript index cf8805821f5..237ab2b32fa 100644 --- a/compiler/testData/codegen/script/parameterLong.ktscript +++ b/compiler/testData/codegen/script/parameterLong.ktscript @@ -1,5 +1,5 @@ // expected: rv: 19 -// param: aa: jet.Long: 17 -// param: bb: jet.Int: 2 +// param: aa: kotlin.Long: 17 +// param: bb: kotlin.Int: 2 aa + bb diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.txt index 3d477a5308a..638ea38d212 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.txt @@ -1,6 +1,6 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { public constructor Anno(/*0*/ e: [ERROR : test.E]) internal final val e: [ERROR : test.E] } diff --git a/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds b/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds index 56f29c35df1..4083725fb79 100644 --- a/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds +++ b/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds @@ -4,7 +4,7 @@ SUBTYPE T Int SUPERTYPE T String type parameter bounds: -T <: jet.Int(SPECIAL), >: jet.String(SPECIAL) +T <: kotlin.Int(SPECIAL), >: kotlin.String(SPECIAL) status: -hasConflictingConstraints: true -hasContradiction: true diff --git a/compiler/testData/constraintSystem/checkStatus/successful.bounds b/compiler/testData/constraintSystem/checkStatus/successful.bounds index 116033159e1..104cd410c48 100644 --- a/compiler/testData/constraintSystem/checkStatus/successful.bounds +++ b/compiler/testData/constraintSystem/checkStatus/successful.bounds @@ -4,7 +4,7 @@ SUBTYPE T Int SUPERTYPE T Int type parameter bounds: -T <: jet.Int(SPECIAL), >: jet.Int(SPECIAL) +T <: kotlin.Int(SPECIAL), >: kotlin.Int(SPECIAL) status: -hasConflictingConstraints: false -hasContradiction: false @@ -15,4 +15,4 @@ status: -isSuccessful: true result: -T=jet.Int +T=kotlin.Int diff --git a/compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds b/compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds index 928cfd4aa1f..e96c7e4abf6 100644 --- a/compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds +++ b/compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds @@ -4,7 +4,7 @@ SUBTYPE T Int SUBTYPE T String weak type parameter bounds: -T <: jet.Int(SPECIAL), <: jet.String(TYPE_BOUND_POSITION(0)) +T <: kotlin.Int(SPECIAL), <: kotlin.String(TYPE_BOUND_POSITION(0)) status: -hasConflictingConstraints: true -hasContradiction: true diff --git a/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds b/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds index f539e2cda5f..5d440ca8665 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds @@ -4,7 +4,7 @@ SUPERTYPE T IntegerValueType(1000) SUBTYPE T Byte type parameter bounds: -T >: IntegerValueType(1000)(SPECIAL), <: jet.Byte(SPECIAL) +T >: IntegerValueType(1000)(SPECIAL), <: kotlin.Byte(SPECIAL) status: -hasConflictingConstraints: true -hasContradiction: true diff --git a/compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds b/compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds index 09ede966f72..a6a216d1d57 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds @@ -15,4 +15,4 @@ status: -isSuccessful: true result: -T=jet.Long +T=kotlin.Long diff --git a/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds b/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds index 8d2acd47896..e3baf10f867 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds @@ -4,7 +4,7 @@ SUPERTYPE T IntegerValueType(1) SUBTYPE T Any type parameter bounds: -T >: IntegerValueType(1)(SPECIAL), <: jet.Any(SPECIAL) +T >: IntegerValueType(1)(SPECIAL), <: kotlin.Any(SPECIAL) status: -hasConflictingConstraints: false -hasContradiction: false @@ -15,4 +15,4 @@ status: -isSuccessful: true result: -T=jet.Int +T=kotlin.Int diff --git a/compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds b/compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds index 6f446658e5f..d26c781929a 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds @@ -4,7 +4,7 @@ SUPERTYPE T IntegerValueType(1) SUPERTYPE T String type parameter bounds: -T >: IntegerValueType(1)(SPECIAL), >: jet.String(SPECIAL) +T >: IntegerValueType(1)(SPECIAL), >: kotlin.String(SPECIAL) status: -hasConflictingConstraints: false -hasContradiction: false @@ -15,4 +15,4 @@ status: -isSuccessful: true result: -T=jet.Comparable +T=kotlin.Comparable diff --git a/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds b/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds index da2bdf21e5a..11423aa3767 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds @@ -15,4 +15,4 @@ status: -isSuccessful: true result: -T=jet.Int +T=kotlin.Int diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds b/compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds index ed1a435cbb7..6c5a458552d 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds @@ -4,7 +4,7 @@ SUPERTYPE T IntegerValueType(1) SUBTYPE T Byte type parameter bounds: -T >: IntegerValueType(1)(SPECIAL), <: jet.Byte(SPECIAL) +T >: IntegerValueType(1)(SPECIAL), <: kotlin.Byte(SPECIAL) status: -hasConflictingConstraints: false -hasContradiction: false @@ -15,4 +15,4 @@ status: -isSuccessful: true result: -T=jet.Byte +T=kotlin.Byte diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds b/compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds index 2b37653950a..665dfb19233 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds @@ -14,4 +14,4 @@ status: -isSuccessful: true result: -T=jet.Int +T=kotlin.Int diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds b/compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds index 4d98f4179fa..2877c8414ea 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds @@ -4,7 +4,7 @@ SUPERTYPE T IntegerValueType(1) SUBTYPE T Short type parameter bounds: -T >: IntegerValueType(1)(SPECIAL), <: jet.Short(SPECIAL) +T >: IntegerValueType(1)(SPECIAL), <: kotlin.Short(SPECIAL) status: -hasConflictingConstraints: false -hasContradiction: false @@ -15,4 +15,4 @@ status: -isSuccessful: true result: -T=jet.Short +T=kotlin.Short diff --git a/compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds b/compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds index a5011ef6f79..c15b6d4d30f 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds +++ b/compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds @@ -3,8 +3,8 @@ VARIABLES T P SUBTYPE T Int type parameter bounds: -T <: jet.Int(SPECIAL) -P <: ???(TYPE_BOUND_POSITION(1)), <: jet.Int(COMPOUND_CONSTRAINT_POSITION) +T <: kotlin.Int(SPECIAL) +P <: ???(TYPE_BOUND_POSITION(1)), <: kotlin.Int(COMPOUND_CONSTRAINT_POSITION) status: -hasConflictingConstraints: false -hasContradiction: false @@ -15,6 +15,6 @@ status: -isSuccessful: true result: -T=jet.Int -P=jet.Int +T=kotlin.Int +P=kotlin.Int diff --git a/compiler/testData/diagnostics/tests/regressions/kt334.kt b/compiler/testData/diagnostics/tests/regressions/kt334.kt index 64c255cd5d9..9990e57d126 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt334.kt +++ b/compiler/testData/diagnostics/tests/regressions/kt334.kt @@ -1,6 +1,6 @@ import java.lang.Comparable as Comparable fun f(c: Comparable<*>) { - c: jet.Comparable<*> + c: kotlin.Comparable<*> c: java.lang.Comparable<*> } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.kt b/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.kt index e95964a5239..6e257ae974a 100644 --- a/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.kt +++ b/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.kt @@ -1,7 +1,7 @@ //FILE:a.kt //+JDK package a -import jet.Map.* +import kotlin.Map.* fun foo(b : Entry) = b @@ -9,7 +9,7 @@ fun foo(b : Entry) = b //+JDK package b -import jet.Map.Entry +import kotlin.Map.Entry fun bar(b : Entry) = b //FILE:c.kt diff --git a/compiler/testData/lazyResolve/recursiveComparator/AnnotationOnObject.txt b/compiler/testData/lazyResolve/recursiveComparator/AnnotationOnObject.txt index 6ce6c7410d3..d1d66468165 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/AnnotationOnObject.txt +++ b/compiler/testData/lazyResolve/recursiveComparator/AnnotationOnObject.txt @@ -1,13 +1,13 @@ package test -internal final annotation class A : jet.Annotation { - /*primary*/ public constructor A(/*0*/ a: jet.Int = ..., /*1*/ b: jet.String = ..., /*2*/ c: jet.String) - internal final val a: jet.Int - internal final val b: jet.String - internal final val c: jet.String +internal final annotation class A : kotlin.Annotation { + /*primary*/ public constructor A(/*0*/ a: kotlin.Int = ..., /*1*/ b: kotlin.String = ..., /*2*/ c: kotlin.String) + internal final val a: kotlin.Int + internal final val b: kotlin.String + internal final val c: kotlin.String } -test.A(a = IntegerValueType(12): IntegerValueType(12), c = "Hello": jet.String) internal object SomeObject { +test.A(a = IntegerValueType(12): IntegerValueType(12), c = "Hello": kotlin.String) internal object SomeObject { /*primary*/ private constructor SomeObject() public class object : test.SomeObject { diff --git a/compiler/testData/lazyResolve/recursiveComparator/ClassObject.kt b/compiler/testData/lazyResolve/recursiveComparator/ClassObject.kt index 8474cd31f33..3f0f1de5846 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/ClassObject.kt +++ b/compiler/testData/lazyResolve/recursiveComparator/ClassObject.kt @@ -3,4 +3,4 @@ package test trait TheTrait { class object { } -} \ No newline at end of file +} diff --git a/compiler/testData/lazyResolve/recursiveComparator/InnerClassNameClash.txt b/compiler/testData/lazyResolve/recursiveComparator/InnerClassNameClash.txt index 14b003777f2..46cf28ee924 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/InnerClassNameClash.txt +++ b/compiler/testData/lazyResolve/recursiveComparator/InnerClassNameClash.txt @@ -5,7 +5,7 @@ internal final class B { internal final class B { /*primary*/ public constructor B() - internal final fun foo(/*0*/ b: test.B.B.C): jet.Unit + internal final fun foo(/*0*/ b: test.B.B.C): kotlin.Unit internal final class C { /*primary*/ public constructor C() diff --git a/compiler/testData/lazyResolve/recursiveComparator/OverrideWithErrors.kt b/compiler/testData/lazyResolve/recursiveComparator/OverrideWithErrors.kt index e492c6cfbeb..b5901668988 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/OverrideWithErrors.kt +++ b/compiler/testData/lazyResolve/recursiveComparator/OverrideWithErrors.kt @@ -6,4 +6,4 @@ open class A { class B : A() { override fun foo(a: E) {} -} \ No newline at end of file +} diff --git a/compiler/testData/lazyResolve/recursiveComparator/OverrideWithErrors.txt b/compiler/testData/lazyResolve/recursiveComparator/OverrideWithErrors.txt index 83a1dc4397e..9ae8e1e735d 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/OverrideWithErrors.txt +++ b/compiler/testData/lazyResolve/recursiveComparator/OverrideWithErrors.txt @@ -2,10 +2,10 @@ package test internal open class A { /*primary*/ public constructor A() - internal open fun foo(/*0*/ a: [ERROR : E]): jet.Unit + internal open fun foo(/*0*/ a: [ERROR : E]): kotlin.Unit } internal final class B : test.A { /*primary*/ public constructor B() - internal open override /*1*/ fun foo(/*0*/ a: [ERROR : E]): jet.Unit + internal open override /*1*/ fun foo(/*0*/ a: [ERROR : E]): kotlin.Unit } diff --git a/compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.txt b/compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.txt index 08239675334..aa0240c15eb 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.txt +++ b/compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.txt @@ -2,8 +2,8 @@ package test internal val some: test.SomeObject -internal final annotation class BadAnnotation : jet.Annotation { - /*primary*/ public constructor BadAnnotation(/*0*/ s: jet.String) +internal final annotation class BadAnnotation : kotlin.Annotation { + /*primary*/ public constructor BadAnnotation(/*0*/ s: kotlin.String) } test.BadAnnotation(s = IntegerValueType(1): IntegerValueType(1)) internal object SomeObject { diff --git a/compiler/testData/lazyResolve/recursiveComparator/classObjectAnnotation.kt b/compiler/testData/lazyResolve/recursiveComparator/classObjectAnnotation.kt index 3988a5d9673..8d7a3e524a5 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/classObjectAnnotation.kt +++ b/compiler/testData/lazyResolve/recursiveComparator/classObjectAnnotation.kt @@ -4,4 +4,4 @@ class Some { TestAnnotation class object { annotation class TestAnnotation } -} \ No newline at end of file +} diff --git a/compiler/testData/lazyResolve/recursiveComparator/classObjectAnnotation.txt b/compiler/testData/lazyResolve/recursiveComparator/classObjectAnnotation.txt index ab574b211b5..11837958e8e 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/classObjectAnnotation.txt +++ b/compiler/testData/lazyResolve/recursiveComparator/classObjectAnnotation.txt @@ -6,7 +6,7 @@ internal final class Some { test.Some.TestAnnotation() internal class object { /*primary*/ private constructor () - internal final annotation class TestAnnotation : jet.Annotation { + internal final annotation class TestAnnotation : kotlin.Annotation { /*primary*/ public constructor TestAnnotation() } } diff --git a/compiler/testData/lazyResolve/recursiveComparator/classObjectHeader.kt b/compiler/testData/lazyResolve/recursiveComparator/classObjectHeader.kt index 5bb2a5ad088..5c4e3ba9d25 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/classObjectHeader.kt +++ b/compiler/testData/lazyResolve/recursiveComparator/classObjectHeader.kt @@ -6,4 +6,4 @@ fun testFun(a : Int) = 12 class TestSome

{ class object : ToResolve

({testFun(it)}) { } -} \ No newline at end of file +} diff --git a/compiler/testData/lazyResolve/recursiveComparator/classObjectHeader.txt b/compiler/testData/lazyResolve/recursiveComparator/classObjectHeader.txt index 2ca691d634e..7334365da70 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/classObjectHeader.txt +++ b/compiler/testData/lazyResolve/recursiveComparator/classObjectHeader.txt @@ -1,6 +1,6 @@ package test -internal fun testFun(/*0*/ a: jet.Int): jet.Int +internal fun testFun(/*0*/ a: kotlin.Int): kotlin.Int internal final class TestSome { /*primary*/ public constructor TestSome() @@ -11,5 +11,5 @@ internal final class TestSome { } internal open class ToResolve { - /*primary*/ public constructor ToResolve(/*0*/ f: (jet.Int) -> jet.Int) + /*primary*/ public constructor ToResolve(/*0*/ f: (kotlin.Int) -> kotlin.Int) } diff --git a/compiler/testData/lazyResolve/recursiveComparator/enum.txt b/compiler/testData/lazyResolve/recursiveComparator/enum.txt index d91d0cb24fe..4141aa4f9fb 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/enum.txt +++ b/compiler/testData/lazyResolve/recursiveComparator/enum.txt @@ -1,37 +1,37 @@ package test -internal final enum class Test : jet.Enum { - /*primary*/ private constructor Test(/*0*/ a: jet.Int) - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int +internal final enum class Test : kotlin.Enum { + /*primary*/ private constructor Test(/*0*/ a: kotlin.Int) + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object { /*primary*/ private constructor () - public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.Test - public final /*synthesized*/ fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Test + public final /*synthesized*/ fun values(): kotlin.Array } public enum entry A : test.Test { /*primary*/ private constructor A() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object : test.Test.A { /*primary*/ private constructor () - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int } } public enum entry B : test.Test { /*primary*/ private constructor B() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object : test.Test.B { /*primary*/ private constructor () - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int } } } diff --git a/compiler/testData/lazyResolve/recursiveComparator/fileDependencyRecursion.kt b/compiler/testData/lazyResolve/recursiveComparator/fileDependencyRecursion.kt index d4302a476a5..184779201f6 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/fileDependencyRecursion.kt +++ b/compiler/testData/lazyResolve/recursiveComparator/fileDependencyRecursion.kt @@ -12,4 +12,4 @@ package testOther import test.normal val some: Int = 1 -val fromImported: Int = normal \ No newline at end of file +val fromImported: Int = normal diff --git a/compiler/testData/lazyResolve/recursiveComparator/fileDependencyRecursion.txt b/compiler/testData/lazyResolve/recursiveComparator/fileDependencyRecursion.txt index 645461606e3..68834b4b33d 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/fileDependencyRecursion.txt +++ b/compiler/testData/lazyResolve/recursiveComparator/fileDependencyRecursion.txt @@ -1,4 +1,4 @@ package test -internal val fromImported: jet.Int -internal val normal: jet.Int +internal val fromImported: kotlin.Int +internal val normal: kotlin.Int diff --git a/compiler/testData/lazyResolve/recursiveComparator/genericFunction.kt b/compiler/testData/lazyResolve/recursiveComparator/genericFunction.kt index f42ba242e51..01db619db7d 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/genericFunction.kt +++ b/compiler/testData/lazyResolve/recursiveComparator/genericFunction.kt @@ -1,3 +1,3 @@ package test -fun foo(t : T) : T {} \ No newline at end of file +fun foo(t : T) : T {} diff --git a/compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImport.kt b/compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImport.kt index a584743dff1..3fd65fd6d42 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImport.kt +++ b/compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImport.kt @@ -10,4 +10,4 @@ val inferTypeFromImportedFun = testFun() package testOther open class A -fun testFun() = 1 \ No newline at end of file +fun testFun() = 1 diff --git a/compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImport.txt b/compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImport.txt index dca0a551872..d1058205ca0 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImport.txt +++ b/compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImport.txt @@ -1,6 +1,6 @@ package test -internal val inferTypeFromImportedFun: jet.Int +internal val inferTypeFromImportedFun: kotlin.Int internal final class B : testOther.A { /*primary*/ public constructor B() diff --git a/compiler/testData/lazyResolve/recursiveComparator/objectInClass.txt b/compiler/testData/lazyResolve/recursiveComparator/objectInClass.txt index 9fb4e6663e2..4bf07be1052 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/objectInClass.txt +++ b/compiler/testData/lazyResolve/recursiveComparator/objectInClass.txt @@ -5,11 +5,11 @@ internal final class A { internal object B { /*primary*/ private constructor B() - internal final fun foo(/*0*/ a: jet.Int): jet.String + internal final fun foo(/*0*/ a: kotlin.Int): kotlin.String public class object : test.A.B { /*primary*/ private constructor () - internal final override /*1*/ /*fake_override*/ fun foo(/*0*/ a: jet.Int): jet.String + internal final override /*1*/ /*fake_override*/ fun foo(/*0*/ a: kotlin.Int): kotlin.String } } } diff --git a/compiler/testData/lazyResolve/recursiveComparator/objectMembers.kt b/compiler/testData/lazyResolve/recursiveComparator/objectMembers.kt index a05a78d2382..3011f3b3bc0 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/objectMembers.kt +++ b/compiler/testData/lazyResolve/recursiveComparator/objectMembers.kt @@ -4,4 +4,4 @@ object SomeObject { fun test(a: Int) : Int { return 0 } -} \ No newline at end of file +} diff --git a/compiler/testData/lazyResolve/recursiveComparator/objectMembers.txt b/compiler/testData/lazyResolve/recursiveComparator/objectMembers.txt index a6cefe3383e..61138364555 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/objectMembers.txt +++ b/compiler/testData/lazyResolve/recursiveComparator/objectMembers.txt @@ -2,10 +2,10 @@ package test internal object SomeObject { /*primary*/ private constructor SomeObject() - internal final fun test(/*0*/ a: jet.Int): jet.Int + internal final fun test(/*0*/ a: kotlin.Int): kotlin.Int public class object : test.SomeObject { /*primary*/ private constructor () - internal final override /*1*/ /*fake_override*/ fun test(/*0*/ a: jet.Int): jet.Int + internal final override /*1*/ /*fake_override*/ fun test(/*0*/ a: kotlin.Int): kotlin.Int } } diff --git a/compiler/testData/lazyResolve/recursiveComparator/packageLevelObject.kt b/compiler/testData/lazyResolve/recursiveComparator/packageLevelObject.kt index 7f4b7548078..e13cccc249b 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/packageLevelObject.kt +++ b/compiler/testData/lazyResolve/recursiveComparator/packageLevelObject.kt @@ -1,4 +1,4 @@ package test object Bar { -} \ No newline at end of file +} diff --git a/compiler/testData/lazyResolve/recursiveComparator/resolveFunctionInsideClassObject.kt b/compiler/testData/lazyResolve/recursiveComparator/resolveFunctionInsideClassObject.kt index 5040cae40d1..0befa69be87 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/resolveFunctionInsideClassObject.kt +++ b/compiler/testData/lazyResolve/recursiveComparator/resolveFunctionInsideClassObject.kt @@ -6,4 +6,4 @@ class Test { class object { val a = test() // Check if resolver will be able to infer type of a variable } -} \ No newline at end of file +} diff --git a/compiler/testData/lazyResolve/recursiveComparator/resolveFunctionInsideClassObject.txt b/compiler/testData/lazyResolve/recursiveComparator/resolveFunctionInsideClassObject.txt index 84a88ca64f9..57347bd6aa2 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/resolveFunctionInsideClassObject.txt +++ b/compiler/testData/lazyResolve/recursiveComparator/resolveFunctionInsideClassObject.txt @@ -2,10 +2,10 @@ package test internal final class Test { /*primary*/ public constructor Test() - internal final fun test(): jet.Int + internal final fun test(): kotlin.Int internal class object { /*primary*/ private constructor () - internal final val a: jet.Int + internal final val a: kotlin.Int } } diff --git a/compiler/testData/lazyResolve/recursiveComparator/sameClassNameResolve.kt b/compiler/testData/lazyResolve/recursiveComparator/sameClassNameResolve.kt index 4688045df14..79d3a50776a 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/sameClassNameResolve.kt +++ b/compiler/testData/lazyResolve/recursiveComparator/sameClassNameResolve.kt @@ -7,4 +7,4 @@ class SubBase: Base() // FILE: SameClassNameResolveRoot.kt open class Base -class SubBase: Base() \ No newline at end of file +class SubBase: Base() diff --git a/compiler/testData/lazyResolve/recursiveComparator/simpleClass.txt b/compiler/testData/lazyResolve/recursiveComparator/simpleClass.txt index 37dd64703df..3dd822d6fba 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/simpleClass.txt +++ b/compiler/testData/lazyResolve/recursiveComparator/simpleClass.txt @@ -5,23 +5,23 @@ internal final class A { } package test.p { - internal fun foo(): jet.Unit - internal fun foo(/*0*/ a: test.p.C): jet.Unit + internal fun foo(): kotlin.Unit + internal fun foo(/*0*/ a: test.p.C): kotlin.Unit internal final class C { /*primary*/ public constructor C() - internal final fun f(): jet.Unit + internal final fun f(): kotlin.Unit } internal open class G { /*primary*/ public constructor G() - internal final fun a(): jet.Unit + internal final fun a(): kotlin.Unit internal open fun f(): T } internal final class G2 : test.p.G { /*primary*/ public constructor G2() - internal final override /*1*/ /*fake_override*/ fun a(): jet.Unit + internal final override /*1*/ /*fake_override*/ fun a(): kotlin.Unit internal open override /*1*/ fun f(): E internal final fun g(): E } diff --git a/compiler/testData/lazyResolve/recursiveComparator/varargIterator.txt b/compiler/testData/lazyResolve/recursiveComparator/varargIterator.txt index 1db96aa1bde..8063ba9e0d5 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/varargIterator.txt +++ b/compiler/testData/lazyResolve/recursiveComparator/varargIterator.txt @@ -1,6 +1,6 @@ package test internal final class CompositeIterator { - /*primary*/ public constructor CompositeIterator(/*0*/ vararg iterators: java.util.Iterator /*jet.Array>*/) - internal final val iteratorsIter: jet.Iterator> + /*primary*/ public constructor CompositeIterator(/*0*/ vararg iterators: java.util.Iterator /*kotlin.Array>*/) + internal final val iteratorsIter: kotlin.Iterator> } diff --git a/compiler/testData/loadJava/compiledJava/EnumMembers.txt b/compiler/testData/loadJava/compiledJava/EnumMembers.txt index 1ccf8cf9041..a7bcebab595 100644 --- a/compiler/testData/loadJava/compiledJava/EnumMembers.txt +++ b/compiler/testData/loadJava/compiledJava/EnumMembers.txt @@ -1,47 +1,47 @@ package test -public final enum class EnumMembers : jet.Enum { - private constructor EnumMembers(/*0*/ p0: jet.Boolean) - public final val isFirst: jet.Boolean - public open fun first(): jet.Boolean - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int +public final enum class EnumMembers : kotlin.Enum { + private constructor EnumMembers(/*0*/ p0: kotlin.Boolean) + public final val isFirst: kotlin.Boolean + public open fun first(): kotlin.Boolean + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object { private constructor () - public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.EnumMembers - public final /*synthesized*/ fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumMembers + public final /*synthesized*/ fun values(): kotlin.Array } public enum entry FIRST : test.EnumMembers { private constructor FIRST() - public final override /*1*/ /*fake_override*/ val isFirst: jet.Boolean - public open override /*1*/ /*fake_override*/ fun first(): jet.Boolean - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ val isFirst: kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun first(): kotlin.Boolean + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object : test.EnumMembers.FIRST { private constructor () - public final override /*1*/ /*fake_override*/ val isFirst: jet.Boolean - public open override /*1*/ /*fake_override*/ fun first(): jet.Boolean - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ val isFirst: kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun first(): kotlin.Boolean + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int } } public enum entry SECOND : test.EnumMembers { private constructor SECOND() - public final override /*1*/ /*fake_override*/ val isFirst: jet.Boolean - public open override /*1*/ /*fake_override*/ fun first(): jet.Boolean - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ val isFirst: kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun first(): kotlin.Boolean + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object : test.EnumMembers.SECOND { private constructor () - public final override /*1*/ /*fake_override*/ val isFirst: jet.Boolean - public open override /*1*/ /*fake_override*/ fun first(): jet.Boolean - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ val isFirst: kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun first(): kotlin.Boolean + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int } } } diff --git a/compiler/testData/loadJava/compiledJava/JavaEnum.txt b/compiler/testData/loadJava/compiledJava/JavaEnum.txt index 96c6d2a0af9..4e828c57f33 100644 --- a/compiler/testData/loadJava/compiledJava/JavaEnum.txt +++ b/compiler/testData/loadJava/compiledJava/JavaEnum.txt @@ -1,37 +1,37 @@ package test -public final enum class JavaEnum : jet.Enum { +public final enum class JavaEnum : kotlin.Enum { private constructor JavaEnum() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object { private constructor () - public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.JavaEnum - public final /*synthesized*/ fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.JavaEnum + public final /*synthesized*/ fun values(): kotlin.Array } public enum entry ANOTHER : test.JavaEnum { private constructor ANOTHER() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object : test.JavaEnum.ANOTHER { private constructor () - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int } } public enum entry ENTRY : test.JavaEnum { private constructor ENTRY() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object : test.JavaEnum.ENTRY { private constructor () - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int } } } diff --git a/compiler/testData/loadJava/compiledJava/OverrideMethod.txt b/compiler/testData/loadJava/compiledJava/OverrideMethod.txt index 38b9c47a9bc..73863464dd5 100644 --- a/compiler/testData/loadJava/compiledJava/OverrideMethod.txt +++ b/compiler/testData/loadJava/compiledJava/OverrideMethod.txt @@ -5,21 +5,21 @@ public open class OverrideMethod : java.lang.Object { public/*package*/ open inner class Base : test.OverrideMethod.SuperBase { public/*package*/ constructor Base() - public/*package*/ open fun bar(): jet.Unit - public/*package*/ open fun foo(/*0*/ p0: jet.String?): jet.String? - public/*package*/ open override /*1*/ /*fake_override*/ fun quux(/*0*/ p0: jet.Int): jet.Unit + public/*package*/ open fun bar(): kotlin.Unit + public/*package*/ open fun foo(/*0*/ p0: kotlin.String?): kotlin.String? + public/*package*/ open override /*1*/ /*fake_override*/ fun quux(/*0*/ p0: kotlin.Int): kotlin.Unit } public/*package*/ open inner class Derived : test.OverrideMethod.Base { public/*package*/ constructor Derived() - public/*package*/ open override /*1*/ /*fake_override*/ fun bar(): jet.Unit - public/*package*/ open fun baz(): jet.Unit - public/*package*/ open override /*1*/ fun foo(/*0*/ p0: jet.String?): jet.String? - public/*package*/ open override /*1*/ /*fake_override*/ fun quux(/*0*/ p0: jet.Int): jet.Unit + public/*package*/ open override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit + public/*package*/ open fun baz(): kotlin.Unit + public/*package*/ open override /*1*/ fun foo(/*0*/ p0: kotlin.String?): kotlin.String? + public/*package*/ open override /*1*/ /*fake_override*/ fun quux(/*0*/ p0: kotlin.Int): kotlin.Unit } public/*package*/ open inner class SuperBase : java.lang.Object { public/*package*/ constructor SuperBase() - public/*package*/ open fun quux(/*0*/ p0: jet.Int): jet.Unit + public/*package*/ open fun quux(/*0*/ p0: kotlin.Int): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.txt b/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.txt index c8cba92ecdb..3d553eb8fdf 100644 --- a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.txt +++ b/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.txt @@ -2,5 +2,5 @@ package test public open class JFrame : awt.Frame { public constructor JFrame() - protected/*protected and package*/ final var accessibleContext: jet.String? + protected/*protected and package*/ final var accessibleContext: kotlin.String? } diff --git a/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.txt b/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.txt index 0d0e3d1f4a1..5b0433a8955 100644 --- a/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.txt +++ b/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.txt @@ -3,13 +3,13 @@ package test public trait RawTypeWithUpperBound : java.lang.Object { public trait Bar : java.lang.Object { - public abstract fun f(/*0*/ p0: test.RawTypeWithUpperBound.Foo?): jet.Unit + public abstract fun f(/*0*/ p0: test.RawTypeWithUpperBound.Foo?): kotlin.Unit } - public trait Foo : java.lang.Object { + public trait Foo : java.lang.Object { } } package test.RawTypeWithUpperBound { - public /*synthesized*/ fun Bar(/*0*/ function: (test.RawTypeWithUpperBound.Foo?) -> jet.Unit): test.RawTypeWithUpperBound.Bar + public /*synthesized*/ fun Bar(/*0*/ function: (test.RawTypeWithUpperBound.Foo?) -> kotlin.Unit): test.RawTypeWithUpperBound.Bar } diff --git a/compiler/testData/loadJava/compiledJava/RawUpperBound.txt b/compiler/testData/loadJava/compiledJava/RawUpperBound.txt index 296cd9b27bf..adef560b0d3 100644 --- a/compiler/testData/loadJava/compiledJava/RawUpperBound.txt +++ b/compiler/testData/loadJava/compiledJava/RawUpperBound.txt @@ -1,4 +1,4 @@ package test -public trait RawUpperBound?> : java.lang.Object { +public trait RawUpperBound?> : java.lang.Object { } diff --git a/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.txt b/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.txt index d4e8e21760b..6a5f9eb134c 100644 --- a/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.txt +++ b/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.txt @@ -1,4 +1,4 @@ package test -public trait RecursiveRawUpperBound?> : java.lang.Object { +public trait RecursiveRawUpperBound?> : java.lang.Object { } diff --git a/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.txt b/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.txt index 6201f964299..b0b52051f5e 100644 --- a/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.txt +++ b/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.txt @@ -1,4 +1,4 @@ package test -public trait RecursiveWildcardUpperBound?> : java.lang.Object { +public trait RecursiveWildcardUpperBound?> : java.lang.Object { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt index bced3df6e83..400477ed354 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt @@ -2,45 +2,45 @@ package test public trait AnnotationInParam : java.lang.Object { - test.AnnotationInParam.MyAnnotationWithParam(value = test.AnnotationInParam.MyAnnotation(value = "test": jet.String): test.AnnotationInParam.MyAnnotation) public open class A : java.lang.Object { + test.AnnotationInParam.MyAnnotationWithParam(value = test.AnnotationInParam.MyAnnotation(value = "test": kotlin.String): test.AnnotationInParam.MyAnnotation) public open class A : java.lang.Object { public constructor A() } - test.AnnotationInParam.MyAnnotationWithParam2(value = test.AnnotationInParam.MyAnnotation2(value = {"test", "test2"}: jet.Array): test.AnnotationInParam.MyAnnotation2) public open class B : java.lang.Object { + test.AnnotationInParam.MyAnnotationWithParam2(value = test.AnnotationInParam.MyAnnotation2(value = {"test", "test2"}: kotlin.Array): test.AnnotationInParam.MyAnnotation2) public open class B : java.lang.Object { public constructor B() } - test.AnnotationInParam.MyAnnotationWithParam3(value = test.AnnotationInParam.MyAnnotation3(first = "f": jet.String, second = "s": jet.String): test.AnnotationInParam.MyAnnotation3) public open class C : java.lang.Object { + test.AnnotationInParam.MyAnnotationWithParam3(value = test.AnnotationInParam.MyAnnotation3(first = "f": kotlin.String, second = "s": kotlin.String): test.AnnotationInParam.MyAnnotation3) public open class C : java.lang.Object { public constructor C() } - public final annotation class MyAnnotation : jet.Annotation { - public constructor MyAnnotation(/*0*/ value: jet.String) - public abstract fun value(): jet.String + public final annotation class MyAnnotation : kotlin.Annotation { + public constructor MyAnnotation(/*0*/ value: kotlin.String) + public abstract fun value(): kotlin.String } - public final annotation class MyAnnotation2 : jet.Annotation { - public constructor MyAnnotation2(/*0*/ vararg value: jet.String /*jet.Array*/) - public abstract fun value(): jet.Array + public final annotation class MyAnnotation2 : kotlin.Annotation { + public constructor MyAnnotation2(/*0*/ vararg value: kotlin.String /*kotlin.Array*/) + public abstract fun value(): kotlin.Array } - public final annotation class MyAnnotation3 : jet.Annotation { - public constructor MyAnnotation3(/*0*/ first: jet.String, /*1*/ second: jet.String) - public abstract fun first(): jet.String - public abstract fun second(): jet.String + public final annotation class MyAnnotation3 : kotlin.Annotation { + public constructor MyAnnotation3(/*0*/ first: kotlin.String, /*1*/ second: kotlin.String) + public abstract fun first(): kotlin.String + public abstract fun second(): kotlin.String } - public final annotation class MyAnnotationWithParam : jet.Annotation { + public final annotation class MyAnnotationWithParam : kotlin.Annotation { public constructor MyAnnotationWithParam(/*0*/ value: test.AnnotationInParam.MyAnnotation) public abstract fun value(): test.AnnotationInParam.MyAnnotation } - public final annotation class MyAnnotationWithParam2 : jet.Annotation { + public final annotation class MyAnnotationWithParam2 : kotlin.Annotation { public constructor MyAnnotationWithParam2(/*0*/ value: test.AnnotationInParam.MyAnnotation2) public abstract fun value(): test.AnnotationInParam.MyAnnotation2 } - public final annotation class MyAnnotationWithParam3 : jet.Annotation { + public final annotation class MyAnnotationWithParam3 : kotlin.Annotation { public constructor MyAnnotationWithParam3(/*0*/ value: test.AnnotationInParam.MyAnnotation3) public abstract fun value(): test.AnnotationInParam.MyAnnotation3 } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt index 3f843d891e0..abbdea05cc9 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt @@ -3,12 +3,12 @@ package test public open class ArithmeticExpressionInParam : java.lang.Object { public constructor ArithmeticExpressionInParam() - public final annotation class Anno : jet.Annotation { - public constructor Anno(/*0*/ value: jet.Int) - public abstract fun value(): jet.Int + public final annotation class Anno : kotlin.Annotation { + public constructor Anno(/*0*/ value: kotlin.Int) + public abstract fun value(): kotlin.Int } - test.ArithmeticExpressionInParam.Anno(value = 42.toInt(): jet.Int) public open class Class : java.lang.Object { + test.ArithmeticExpressionInParam.Anno(value = 42.toInt(): kotlin.Int) public open class Class : java.lang.Object { public constructor Class() } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt index d184d08ed13..f6f9550a218 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt @@ -2,8 +2,8 @@ package test public trait ArrayOfEnumInParam : java.lang.Object { - java.lang.annotation.Target(value = {ElementType.FIELD, ElementType.CONSTRUCTOR}: jet.Array) public final annotation class targetAnnotation : jet.Annotation { - public constructor targetAnnotation(/*0*/ value: jet.String) - public abstract fun value(): jet.String + java.lang.annotation.Target(value = {ElementType.FIELD, ElementType.CONSTRUCTOR}: kotlin.Array) public final annotation class targetAnnotation : kotlin.Annotation { + public constructor targetAnnotation(/*0*/ value: kotlin.String) + public abstract fun value(): kotlin.String } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt index 150934d9142..5d0e5cebeaa 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt @@ -2,12 +2,12 @@ package test public trait ArrayOfStringInParam : java.lang.Object { - test.ArrayOfStringInParam.MyAnnotation(value = {"a", "b", "c"}: jet.Array) public open class A : java.lang.Object { + test.ArrayOfStringInParam.MyAnnotation(value = {"a", "b", "c"}: kotlin.Array) public open class A : java.lang.Object { public constructor A() } - public final annotation class MyAnnotation : jet.Annotation { - public constructor MyAnnotation(/*0*/ vararg value: jet.String /*jet.Array*/) - public abstract fun value(): jet.Array + public final annotation class MyAnnotation : kotlin.Annotation { + public constructor MyAnnotation(/*0*/ vararg value: kotlin.String /*kotlin.Array*/) + public abstract fun value(): kotlin.Array } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt index 82307175737..902f6d8b71c 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt @@ -3,12 +3,12 @@ package test public open class ClassObjectArrayInParam : java.lang.Object { public constructor ClassObjectArrayInParam() - public final annotation class Anno : jet.Annotation { - public constructor Anno(/*0*/ vararg value: java.lang.Class /*jet.Array>*/) - public abstract fun value(): jet.Array> + public final annotation class Anno : kotlin.Annotation { + public constructor Anno(/*0*/ vararg value: java.lang.Class /*kotlin.Array>*/) + public abstract fun value(): kotlin.Array> } - test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam.class, test.ClassObjectArrayInParam.Nested.class, jet.String.class}: jet.Array>) public open class Nested : java.lang.Object { + test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam.class, test.ClassObjectArrayInParam.Nested.class, kotlin.String.class}: kotlin.Array>) public open class Nested : java.lang.Object { public constructor Nested() } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt index 69a8a6de9da..7b401d346fb 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt @@ -3,9 +3,9 @@ package test public open class ClassObjectInParam : java.lang.Object { public constructor ClassObjectInParam() - public final annotation class Anno : jet.Annotation { - public constructor Anno(/*0*/ value: java.lang.Class) - public abstract fun value(): java.lang.Class + public final annotation class Anno : kotlin.Annotation { + public constructor Anno(/*0*/ value: java.lang.Class) + public abstract fun value(): java.lang.Class } test.ClassObjectInParam.Anno(value = test.ClassObjectInParam.class: java.lang.Class) public open class Nested : java.lang.Object { diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt index 2b77c5cea21..18e090f7bfb 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt @@ -2,31 +2,31 @@ package test public trait CustomAnnotation : java.lang.Object { - public final annotation class MyAnnotation : jet.Annotation { + public final annotation class MyAnnotation : kotlin.Annotation { public constructor MyAnnotation(/*0*/ value: test.CustomAnnotation.MyEnum) public abstract fun value(): test.CustomAnnotation.MyEnum } - public final enum class MyEnum : jet.Enum { + public final enum class MyEnum : kotlin.Enum { private constructor MyEnum() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object { private constructor () - public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.CustomAnnotation.MyEnum - public final /*synthesized*/ fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.CustomAnnotation.MyEnum + public final /*synthesized*/ fun values(): kotlin.Array } public enum entry ONE : test.CustomAnnotation.MyEnum { private constructor ONE() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object : test.CustomAnnotation.MyEnum.ONE { private constructor () - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int } } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt index 35263561f13..d1c3e3262c8 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt @@ -2,13 +2,13 @@ package test public trait CustomAnnotationWithDefaultParameter : java.lang.Object { - public final annotation class MyAnnotation : jet.Annotation { - public constructor MyAnnotation(/*0*/ first: jet.String, /*1*/ second: jet.String = ...) - public abstract fun first(): jet.String - public abstract fun second(): jet.String + public final annotation class MyAnnotation : kotlin.Annotation { + public constructor MyAnnotation(/*0*/ first: kotlin.String, /*1*/ second: kotlin.String = ...) + public abstract fun first(): kotlin.String + public abstract fun second(): kotlin.String } - test.CustomAnnotationWithDefaultParameter.MyAnnotation(first = "f": jet.String, second = "s": jet.String) public open class MyTest : java.lang.Object { + test.CustomAnnotationWithDefaultParameter.MyAnnotation(first = "f": kotlin.String, second = "s": kotlin.String) public open class MyTest : java.lang.Object { public constructor MyTest() } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt index 6291ea4cac1..4e4186709a7 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt @@ -2,12 +2,12 @@ package test public trait EmptyArrayInParam : java.lang.Object { - test.EmptyArrayInParam.MyAnnotation(value = {}: jet.Array) public open class A : java.lang.Object { + test.EmptyArrayInParam.MyAnnotation(value = {}: kotlin.Array) public open class A : java.lang.Object { public constructor A() } - public final annotation class MyAnnotation : jet.Annotation { - public constructor MyAnnotation(/*0*/ vararg value: jet.String /*jet.Array*/) - public abstract fun value(): jet.Array + public final annotation class MyAnnotation : kotlin.Annotation { + public constructor MyAnnotation(/*0*/ vararg value: kotlin.String /*kotlin.Array*/) + public abstract fun value(): kotlin.Array } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt index 6ac491fd4d6..597d9368152 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt @@ -2,8 +2,8 @@ package test public trait EnumInParam : java.lang.Object { - java.lang.annotation.Retention(value = RetentionPolicy.RUNTIME: java.lang.annotation.RetentionPolicy) public final annotation class RetentionAnnotation : jet.Annotation { - public constructor RetentionAnnotation(/*0*/ value: jet.String) - public abstract fun value(): jet.String + java.lang.annotation.Retention(value = RetentionPolicy.RUNTIME: java.lang.annotation.RetentionPolicy) public final annotation class RetentionAnnotation : kotlin.Annotation { + public constructor RetentionAnnotation(/*0*/ value: kotlin.String) + public abstract fun value(): kotlin.String } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt index c27bae720f0..e997556a28f 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt @@ -2,17 +2,17 @@ package test public trait PrimitiveValueInParam : java.lang.Object { - test.PrimitiveValueInParam.Ann(bool = true: jet.Boolean, d = 1.0.toDouble(): jet.Double, f = 1.0.toFloat(): jet.Float, i = 1.toInt(): jet.Int, l = 1.toLong(): jet.Long, str = "str": jet.String) public open class A : java.lang.Object { + test.PrimitiveValueInParam.Ann(bool = true: kotlin.Boolean, d = 1.0.toDouble(): kotlin.Double, f = 1.0.toFloat(): kotlin.Float, i = 1.toInt(): kotlin.Int, l = 1.toLong(): kotlin.Long, str = "str": kotlin.String) public open class A : java.lang.Object { public constructor A() } - public final annotation class Ann : jet.Annotation { - public constructor Ann(/*0*/ i: jet.Int, /*1*/ l: jet.Long, /*2*/ d: jet.Double, /*3*/ f: jet.Float, /*4*/ bool: jet.Boolean, /*5*/ str: jet.String) - public abstract fun bool(): jet.Boolean - public abstract fun d(): jet.Double - public abstract fun f(): jet.Float - public abstract fun i(): jet.Int - public abstract fun l(): jet.Long - public abstract fun str(): jet.String + public final annotation class Ann : kotlin.Annotation { + public constructor Ann(/*0*/ i: kotlin.Int, /*1*/ l: kotlin.Long, /*2*/ d: kotlin.Double, /*3*/ f: kotlin.Float, /*4*/ bool: kotlin.Boolean, /*5*/ str: kotlin.String) + public abstract fun bool(): kotlin.Boolean + public abstract fun d(): kotlin.Double + public abstract fun f(): kotlin.Float + public abstract fun i(): kotlin.Int + public abstract fun l(): kotlin.Long + public abstract fun str(): kotlin.String } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt index ac07f0b3d1b..8a3eb6b155e 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt @@ -2,12 +2,12 @@ package test public trait RecursiveAnnotation : java.lang.Object { - test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test": jet.String): test.RecursiveAnnotation.A) public final annotation class A : jet.Annotation { - public constructor A(/*0*/ value: jet.String) - public abstract fun value(): jet.String + test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test": kotlin.String): test.RecursiveAnnotation.A) public final annotation class A : kotlin.Annotation { + public constructor A(/*0*/ value: kotlin.String) + public abstract fun value(): kotlin.String } - test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test": jet.String): test.RecursiveAnnotation.A) public final annotation class B : jet.Annotation { + test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test": kotlin.String): test.RecursiveAnnotation.A) public final annotation class B : kotlin.Annotation { public constructor B(/*0*/ value: test.RecursiveAnnotation.A) public abstract fun value(): test.RecursiveAnnotation.A } diff --git a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt index bc9d1999c21..3d22b72e715 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt @@ -2,13 +2,13 @@ package test public trait RecursiveAnnotation2 : java.lang.Object { - public final annotation class A : jet.Annotation { + public final annotation class A : kotlin.Annotation { public constructor A(/*0*/ value: test.RecursiveAnnotation2.B) public abstract fun value(): test.RecursiveAnnotation2.B } - test.RecursiveAnnotation2.A(value = test.RecursiveAnnotation2.B(value = "test": jet.String): test.RecursiveAnnotation2.B) public final annotation class B : jet.Annotation { - public constructor B(/*0*/ value: jet.String) - public abstract fun value(): jet.String + test.RecursiveAnnotation2.A(value = test.RecursiveAnnotation2.B(value = "test": kotlin.String): test.RecursiveAnnotation2.B) public final annotation class B : kotlin.Annotation { + public constructor B(/*0*/ value: kotlin.String) + public abstract fun value(): kotlin.String } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt index 96290ad65eb..9290a31148f 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt @@ -2,12 +2,12 @@ package test public trait StringConcatenationInParam : java.lang.Object { - public final annotation class Anno : jet.Annotation { - public constructor Anno(/*0*/ value: jet.String) - public abstract fun value(): jet.String + public final annotation class Anno : kotlin.Annotation { + public constructor Anno(/*0*/ value: kotlin.String) + public abstract fun value(): kotlin.String } - test.StringConcatenationInParam.Anno(value = "hello": jet.String) public open class Class : java.lang.Object { + test.StringConcatenationInParam.Anno(value = "hello": kotlin.String) public open class Class : java.lang.Object { public constructor Class() } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt index ed230003b4b..14824505cc8 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt @@ -2,16 +2,16 @@ package test public trait StringConstantInParam : java.lang.Object { - public final annotation class Anno : jet.Annotation { - public constructor Anno(/*0*/ value: jet.String) - public abstract fun value(): jet.String + public final annotation class Anno : kotlin.Annotation { + public constructor Anno(/*0*/ value: kotlin.String) + public abstract fun value(): kotlin.String } - test.StringConstantInParam.Anno(value = "hello": jet.String) public open class Class : java.lang.Object { + test.StringConstantInParam.Anno(value = "hello": kotlin.String) public open class Class : java.lang.Object { public constructor Class() } } package test.StringConstantInParam { - public val HEL: jet.String + public val HEL: kotlin.String } diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt index 4771271cf64..bbb3fe884e9 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt @@ -2,12 +2,12 @@ package test public trait StringInParam : java.lang.Object { - public final annotation class Anno : jet.Annotation { - public constructor Anno(/*0*/ value: jet.String) - public abstract fun value(): jet.String + public final annotation class Anno : kotlin.Annotation { + public constructor Anno(/*0*/ value: kotlin.String) + public abstract fun value(): kotlin.String } - test.StringInParam.Anno(value = "hello": jet.String) public open class Class : java.lang.Object { + test.StringInParam.Anno(value = "hello": kotlin.String) public open class Class : java.lang.Object { public constructor Class() } } diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.txt index 7c58db2484a..7dce629a171 100644 --- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.txt +++ b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.txt @@ -2,5 +2,5 @@ package test public open class ProtectedPackageFun : java.lang.Object { public constructor ProtectedPackageFun() - protected/*protected and package*/ open fun foo(): jet.Unit + protected/*protected and package*/ open fun foo(): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.txt index f61e88c768b..ef369cb29b6 100644 --- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.txt +++ b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.txt @@ -2,5 +2,5 @@ package test public open class ProtectedPackageProperty : java.lang.Object { public constructor ProtectedPackageProperty() - protected/*protected and package*/ final var foo: jet.Int + protected/*protected and package*/ final var foo: kotlin.Int } diff --git a/compiler/testData/loadJava/compiledJava/sam/Comparator.txt b/compiler/testData/loadJava/compiledJava/sam/Comparator.txt index 3f4a0c7c2e2..b1528e24b78 100644 --- a/compiler/testData/loadJava/compiledJava/sam/Comparator.txt +++ b/compiler/testData/loadJava/compiledJava/sam/Comparator.txt @@ -1,7 +1,7 @@ package test -public /*synthesized*/ fun Comparator(/*0*/ function: (T?, T?) -> jet.Int): test.Comparator +public /*synthesized*/ fun Comparator(/*0*/ function: (T?, T?) -> kotlin.Int): test.Comparator public trait Comparator : java.lang.Object { - public abstract fun compare(/*0*/ p0: T?, /*1*/ p1: T?): jet.Int + public abstract fun compare(/*0*/ p0: T?, /*1*/ p1: T?): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.txt b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.txt index f485517810c..c4811263030 100644 --- a/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.txt +++ b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.txt @@ -1,7 +1,7 @@ package test -public /*synthesized*/ fun FilenameFilter(/*0*/ function: (java.io.File?, jet.String?) -> jet.Boolean): test.FilenameFilter +public /*synthesized*/ fun FilenameFilter(/*0*/ function: (java.io.File?, kotlin.String?) -> kotlin.Boolean): test.FilenameFilter public trait FilenameFilter : java.lang.Object { - public abstract fun accept(/*0*/ p0: java.io.File?, /*1*/ p1: jet.String?): jet.Boolean + public abstract fun accept(/*0*/ p0: java.io.File?, /*1*/ p1: kotlin.String?): kotlin.Boolean } diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt index b88f28d1d86..ecbe0188989 100644 --- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt +++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt @@ -1,7 +1,7 @@ package test -public /*synthesized*/ fun ?, /*1*/ B : jet.List?> GenericInterfaceParametersWithBounds(/*0*/ function: (jet.Array?, B?) -> jet.Unit): test.GenericInterfaceParametersWithBounds where A : java.lang.Cloneable? +public /*synthesized*/ fun ?, /*1*/ B : kotlin.List?> GenericInterfaceParametersWithBounds(/*0*/ function: (kotlin.Array?, B?) -> kotlin.Unit): test.GenericInterfaceParametersWithBounds where A : java.lang.Cloneable? -public trait GenericInterfaceParametersWithBounds?, /*1*/ B : jet.List?> : java.lang.Object where A : java.lang.Cloneable? { - public abstract fun method(/*0*/ p0: jet.Array?, /*1*/ p1: B?): jet.Unit +public trait GenericInterfaceParametersWithBounds?, /*1*/ B : kotlin.List?> : java.lang.Object where A : java.lang.Cloneable? { + public abstract fun method(/*0*/ p0: kotlin.Array?, /*1*/ p1: B?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt index f41d3eea2e5..1d09e6552d2 100644 --- a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt +++ b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt @@ -1,5 +1,5 @@ package test public trait GenericMethodParameters : java.lang.Object { - public abstract fun ?> method(/*0*/ p0: jet.Array?, /*1*/ p1: B?): jet.Unit + public abstract fun ?> method(/*0*/ p0: kotlin.Array?, /*1*/ p1: B?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/sam/Nested.txt b/compiler/testData/loadJava/compiledJava/sam/Nested.txt index 9dd5ab41dc9..b2b156cc448 100644 --- a/compiler/testData/loadJava/compiledJava/sam/Nested.txt +++ b/compiler/testData/loadJava/compiledJava/sam/Nested.txt @@ -5,27 +5,27 @@ public trait Nested : java.lang.Object { public trait Deeper1 : java.lang.Object { public trait Runnable : java.lang.Object { - public abstract fun run(): jet.Unit - public abstract fun run2(): jet.Unit + public abstract fun run(): kotlin.Unit + public abstract fun run2(): kotlin.Unit } } public trait Deeper2 : java.lang.Object { public trait Runnable : java.lang.Object { - public abstract fun run(): jet.Unit + public abstract fun run(): kotlin.Unit } } public trait Runnable : java.lang.Object { - public abstract fun run(): jet.Unit + public abstract fun run(): kotlin.Unit } } package test.Nested { - public /*synthesized*/ fun Runnable(/*0*/ function: () -> jet.Unit): test.Nested.Runnable + public /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Nested.Runnable package test.Nested.Deeper2 { - public /*synthesized*/ fun Runnable(/*0*/ function: () -> jet.Unit): test.Nested.Deeper2.Runnable + public /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Nested.Deeper2.Runnable } } diff --git a/compiler/testData/loadJava/compiledJava/sam/Runnable.txt b/compiler/testData/loadJava/compiledJava/sam/Runnable.txt index fcb65939c74..15c4d1311ac 100644 --- a/compiler/testData/loadJava/compiledJava/sam/Runnable.txt +++ b/compiler/testData/loadJava/compiledJava/sam/Runnable.txt @@ -1,7 +1,7 @@ package test -public /*synthesized*/ fun Runnable(/*0*/ function: () -> jet.Unit): test.Runnable +public /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Runnable public trait Runnable : java.lang.Object { - public abstract fun run(): jet.Unit + public abstract fun run(): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt index af4dec82288..d9d72e8ddd6 100644 --- a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt +++ b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt @@ -2,12 +2,12 @@ package test public trait SamSubinterfaceOfTwo : java.lang.Object { - public trait Sub : test.SamSubinterfaceOfTwo.Super1, test.SamSubinterfaceOfTwo.Super2 { - public abstract override /*2*/ /*fake_override*/ fun f(): jet.String? + public trait Sub : test.SamSubinterfaceOfTwo.Super1, test.SamSubinterfaceOfTwo.Super2 { + public abstract override /*2*/ /*fake_override*/ fun f(): kotlin.String? } public trait Super1 : java.lang.Object { - public abstract fun f(): jet.CharSequence? + public abstract fun f(): kotlin.CharSequence? } public trait Super2 : java.lang.Object { @@ -16,7 +16,7 @@ public trait SamSubinterfaceOfTwo : java.lang.Object { } package test.SamSubinterfaceOfTwo { - public /*synthesized*/ fun Sub(/*0*/ function: () -> jet.String?): test.SamSubinterfaceOfTwo.Sub - public /*synthesized*/ fun Super1(/*0*/ function: () -> jet.CharSequence?): test.SamSubinterfaceOfTwo.Super1 + public /*synthesized*/ fun Sub(/*0*/ function: () -> kotlin.String?): test.SamSubinterfaceOfTwo.Sub + public /*synthesized*/ fun Super1(/*0*/ function: () -> kotlin.CharSequence?): test.SamSubinterfaceOfTwo.Super1 public /*synthesized*/ fun Super2(/*0*/ function: () -> T?): test.SamSubinterfaceOfTwo.Super2 } diff --git a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.txt b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.txt index fbdec2aa483..d30c2bf84fe 100644 --- a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.txt +++ b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.txt @@ -1,7 +1,7 @@ package test -public /*synthesized*/ fun SamSubinterfaceOverridding(/*0*/ function: () -> jet.Unit): test.SamSubinterfaceOverridding +public /*synthesized*/ fun SamSubinterfaceOverridding(/*0*/ function: () -> kotlin.Unit): test.SamSubinterfaceOverridding public trait SamSubinterfaceOverridding : java.lang.Runnable { - public abstract override /*1*/ fun run(): jet.Unit + public abstract override /*1*/ fun run(): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.txt b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.txt index 3acfe4b8486..3ba4ec2a28e 100644 --- a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.txt +++ b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.txt @@ -1,7 +1,7 @@ package test -public /*synthesized*/ fun SubstitutedSamInterface(/*0*/ function: (jet.String, jet.String) -> jet.Int): test.SubstitutedSamInterface +public /*synthesized*/ fun SubstitutedSamInterface(/*0*/ function: (kotlin.String, kotlin.String) -> kotlin.Int): test.SubstitutedSamInterface -public trait SubstitutedSamInterface : java.util.Comparator { - public abstract override /*1*/ /*fake_override*/ fun compare(/*0*/ p0: jet.String, /*1*/ p1: jet.String): jet.Int +public trait SubstitutedSamInterface : java.util.Comparator { + public abstract override /*1*/ /*fake_override*/ fun compare(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.String): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.txt b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.txt index cd1b36fa97e..ae3fadd30f2 100644 --- a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.txt +++ b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.txt @@ -1,7 +1,7 @@ package test -public /*synthesized*/ fun SubstitutedSamInterfaceSubclassOfBuiltin(/*0*/ function: (test.SubstitutedSamInterfaceSubclassOfBuiltin) -> jet.Int): test.SubstitutedSamInterfaceSubclassOfBuiltin +public /*synthesized*/ fun SubstitutedSamInterfaceSubclassOfBuiltin(/*0*/ function: (test.SubstitutedSamInterfaceSubclassOfBuiltin) -> kotlin.Int): test.SubstitutedSamInterfaceSubclassOfBuiltin -public trait SubstitutedSamInterfaceSubclassOfBuiltin : jet.Comparable { - public abstract override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.SubstitutedSamInterfaceSubclassOfBuiltin): jet.Int +public trait SubstitutedSamInterfaceSubclassOfBuiltin : kotlin.Comparable { + public abstract override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.SubstitutedSamInterfaceSubclassOfBuiltin): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledJava/sam/VarargParameter.txt b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.txt index 2d15eabbdc7..9bc1fae75f1 100644 --- a/compiler/testData/loadJava/compiledJava/sam/VarargParameter.txt +++ b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.txt @@ -1,7 +1,7 @@ package test -public /*synthesized*/ fun VarargParameter(/*0*/ function: (jet.Array) -> jet.Unit): test.VarargParameter +public /*synthesized*/ fun VarargParameter(/*0*/ function: (kotlin.Array) -> kotlin.Unit): test.VarargParameter public trait VarargParameter : java.lang.Object { - public abstract fun f(/*0*/ vararg p0: jet.String? /*jet.Array*/): jet.Unit + public abstract fun f(/*0*/ vararg p0: kotlin.String? /*kotlin.Array*/): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.txt index 56682f67e1f..3783065daca 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.txt @@ -2,8 +2,8 @@ package test public open class AmbiguousAdapters : java.lang.Object { public constructor AmbiguousAdapters() - public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public open fun foo(/*0*/ p0: java.io.Closeable?): jet.Unit - public open fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public open fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit + public open fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.txt index eaf1ee04f88..5c95cc70b3e 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.txt @@ -2,11 +2,11 @@ package test public open class Basic : java.lang.Object { public constructor Basic() - public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public open fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public open fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } package test.Basic { - public /*synthesized*/ fun bar(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public open fun bar(/*0*/ p0: java.lang.Runnable?): jet.Unit + public /*synthesized*/ fun bar(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public open fun bar(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.txt index a9b54f026fc..29507dc5105 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.txt @@ -1,6 +1,6 @@ package test public open class Constructor : java.lang.Object { - public /*synthesized*/ constructor Constructor(/*0*/ p0: (() -> jet.Unit)?) + public /*synthesized*/ constructor Constructor(/*0*/ p0: (() -> kotlin.Unit)?) public constructor Constructor(/*0*/ p0: java.lang.Runnable?) } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt index b328a3611c8..ab5d2d09b77 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt @@ -3,17 +3,17 @@ package test public trait DeepSamLoop : java.lang.Object { public trait Bar : java.lang.Object { - public final /*synthesized*/ fun foo(/*0*/ p0: ((test.DeepSamLoop.Bar?) -> jet.Unit)?): jet.Unit - public abstract fun foo(/*0*/ p0: test.DeepSamLoop.Foo?): jet.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: ((test.DeepSamLoop.Bar?) -> kotlin.Unit)?): kotlin.Unit + public abstract fun foo(/*0*/ p0: test.DeepSamLoop.Foo?): kotlin.Unit } public trait Foo : java.lang.Object { - public final /*synthesized*/ fun foo(/*0*/ p0: ((test.DeepSamLoop.Foo?) -> jet.Unit)?): jet.Unit - public abstract fun foo(/*0*/ p0: test.DeepSamLoop.Bar?): jet.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: ((test.DeepSamLoop.Foo?) -> kotlin.Unit)?): kotlin.Unit + public abstract fun foo(/*0*/ p0: test.DeepSamLoop.Bar?): kotlin.Unit } } package test.DeepSamLoop { - public /*synthesized*/ fun Bar(/*0*/ function: (test.DeepSamLoop.Foo?) -> jet.Unit): test.DeepSamLoop.Bar - public /*synthesized*/ fun Foo(/*0*/ function: (test.DeepSamLoop.Bar?) -> jet.Unit): test.DeepSamLoop.Foo + public /*synthesized*/ fun Bar(/*0*/ function: (test.DeepSamLoop.Foo?) -> kotlin.Unit): test.DeepSamLoop.Bar + public /*synthesized*/ fun Foo(/*0*/ function: (test.DeepSamLoop.Bar?) -> kotlin.Unit): test.DeepSamLoop.Foo } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.txt index d7c7ee885ec..64296055194 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.txt @@ -2,11 +2,11 @@ package test public open class NonTrivialFunctionType : java.lang.Object { public constructor NonTrivialFunctionType() - public final /*synthesized*/ fun foo(/*0*/ p0: ((java.io.File, jet.String) -> jet.Boolean)?): jet.Unit - public final /*synthesized*/ fun foo(/*0*/ p0: ((jet.String, jet.String) -> jet.Int)?): jet.Unit - public open fun foo(/*0*/ p0: java.io.FilenameFilter?): jet.Unit - public open fun foo(/*0*/ p0: java.util.Comparator?): jet.Unit - public final /*synthesized*/ fun wildcardBound(/*0*/ p0: ((jet.CharSequence?, jet.CharSequence?) -> jet.Int)?): jet.Unit - public open fun wildcardBound(/*0*/ p0: java.util.Comparator?): jet.Unit - public open fun wildcardUnbound(/*0*/ p0: java.util.Comparator?): jet.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: ((java.io.File, kotlin.String) -> kotlin.Boolean)?): kotlin.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: ((kotlin.String, kotlin.String) -> kotlin.Int)?): kotlin.Unit + public open fun foo(/*0*/ p0: java.io.FilenameFilter?): kotlin.Unit + public open fun foo(/*0*/ p0: java.util.Comparator?): kotlin.Unit + public final /*synthesized*/ fun wildcardBound(/*0*/ p0: ((kotlin.CharSequence?, kotlin.CharSequence?) -> kotlin.Int)?): kotlin.Unit + public open fun wildcardBound(/*0*/ p0: java.util.Comparator?): kotlin.Unit + public open fun wildcardUnbound(/*0*/ p0: java.util.Comparator?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.txt index 6be1be988f2..8cfa6014ef4 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.txt @@ -1,8 +1,8 @@ package test -public /*synthesized*/ fun SelfAsParameter(/*0*/ function: (test.SelfAsParameter?) -> jet.Unit): test.SelfAsParameter +public /*synthesized*/ fun SelfAsParameter(/*0*/ function: (test.SelfAsParameter?) -> kotlin.Unit): test.SelfAsParameter public trait SelfAsParameter : java.lang.Object { - public final /*synthesized*/ fun foo(/*0*/ p0: ((test.SelfAsParameter?) -> jet.Unit)?): jet.Unit - public abstract fun foo(/*0*/ p0: test.SelfAsParameter?): jet.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: ((test.SelfAsParameter?) -> kotlin.Unit)?): kotlin.Unit + public abstract fun foo(/*0*/ p0: test.SelfAsParameter?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.txt index 308e873f525..b1a07123052 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.txt @@ -5,6 +5,6 @@ public open class SeveralSamParameters : java.lang.Object { } package test.SeveralSamParameters { - public /*synthesized*/ fun findMaxAndInvokeCallback(/*0*/ p0: ((jet.String, jet.String) -> jet.Int)?, /*1*/ p1: jet.String?, /*2*/ p2: jet.String?, /*3*/ p3: (() -> jet.Unit)?): jet.String? - public open fun findMaxAndInvokeCallback(/*0*/ p0: java.util.Comparator?, /*1*/ p1: jet.String?, /*2*/ p2: jet.String?, /*3*/ p3: java.lang.Runnable?): jet.String? + public /*synthesized*/ fun findMaxAndInvokeCallback(/*0*/ p0: ((kotlin.String, kotlin.String) -> kotlin.Int)?, /*1*/ p1: kotlin.String?, /*2*/ p2: kotlin.String?, /*3*/ p3: (() -> kotlin.Unit)?): kotlin.String? + public open fun findMaxAndInvokeCallback(/*0*/ p0: java.util.Comparator?, /*1*/ p1: kotlin.String?, /*2*/ p2: kotlin.String?, /*3*/ p3: java.lang.Runnable?): kotlin.String? } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.txt index a326e1a3193..c3b5265f231 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.txt @@ -2,6 +2,6 @@ package test public open class TypeParameterOfClass : java.lang.Object { public constructor TypeParameterOfClass() - public final /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> jet.Int)?): jet.Unit - public open fun foo(/*0*/ p0: java.util.Comparator?): jet.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> kotlin.Int)?): kotlin.Unit + public open fun foo(/*0*/ p0: java.util.Comparator?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt index 00051288b5e..309c3cb0023 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt @@ -5,10 +5,10 @@ public open class TypeParameterOfMethod : java.lang.Object { } package test.TypeParameterOfMethod { - public /*synthesized*/ fun max(/*0*/ p0: ((T, T) -> jet.Int)?, /*1*/ p1: T?, /*2*/ p2: T?): T? + public /*synthesized*/ fun max(/*0*/ p0: ((T, T) -> kotlin.Int)?, /*1*/ p1: T?, /*2*/ p2: T?): T? public open fun max(/*0*/ p0: java.util.Comparator?, /*1*/ p1: T?, /*2*/ p2: T?): T? - public /*synthesized*/ fun max2(/*0*/ p0: ((T, T) -> jet.Int)?, /*1*/ p1: T?, /*2*/ p2: T?): T? - public open fun max2(/*0*/ p0: java.util.Comparator?, /*1*/ p1: T?, /*2*/ p2: T?): T? - public /*synthesized*/ fun ?> method(/*0*/ p0: ((A, A) -> jet.Int)?, /*1*/ p1: B?): jet.Unit - public open fun ?> method(/*0*/ p0: java.util.Comparator?, /*1*/ p1: B?): jet.Unit + public /*synthesized*/ fun max2(/*0*/ p0: ((T, T) -> kotlin.Int)?, /*1*/ p1: T?, /*2*/ p2: T?): T? + public open fun max2(/*0*/ p0: java.util.Comparator?, /*1*/ p1: T?, /*2*/ p2: T?): T? + public /*synthesized*/ fun ?> method(/*0*/ p0: ((A, A) -> kotlin.Int)?, /*1*/ p1: B?): kotlin.Unit + public open fun ?> method(/*0*/ p0: java.util.Comparator?, /*1*/ p1: B?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.txt index 6310933b0c9..e2d97c50465 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.txt @@ -5,7 +5,7 @@ public open class TypeParameterOfOuterClass : java.lang.Object { public open inner class Inner : java.lang.Object { public constructor Inner() - public final /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> jet.Int)?): jet.Unit - public open fun foo(/*0*/ p0: java.util.Comparator?): jet.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> kotlin.Int)?): kotlin.Unit + public open fun foo(/*0*/ p0: java.util.Comparator?): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.java b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.java index ae3f6895344..0b6a153d6ea 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.java +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.java @@ -2,7 +2,7 @@ package test; public interface AdapterDoesntOverrideDeclaration { public interface Super { - void foo(jet.Function0 r); + void foo(kotlin.Function0 r); } public interface Sub extends Super { diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.txt index e34eb6aa35a..848f8a4ffec 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.txt @@ -3,16 +3,16 @@ package test public trait AdapterDoesntOverrideDeclaration : java.lang.Object { public trait Sub : test.AdapterDoesntOverrideDeclaration.Super { - public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public abstract fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit + public abstract fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit } } package test.AdapterDoesntOverrideDeclaration { - public /*synthesized*/ fun Super(/*0*/ function: ((() -> jet.Unit)?) -> jet.Unit): test.AdapterDoesntOverrideDeclaration.Super + public /*synthesized*/ fun Super(/*0*/ function: ((() -> kotlin.Unit)?) -> kotlin.Unit): test.AdapterDoesntOverrideDeclaration.Super } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.java b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.java index 26cb97e0900..943dfaf160e 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.java +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.java @@ -3,7 +3,7 @@ package test; public interface InheritedAdapterAndDeclaration { public interface Super { void foo(Runnable r); - void foo(jet.Function0 r); + void foo(kotlin.Function0 r); } public interface Sub extends Super { diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.txt index d4614d59b8d..dde31a762ab 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.txt @@ -3,14 +3,14 @@ package test public trait InheritedAdapterAndDeclaration : java.lang.Object { public trait Sub : test.InheritedAdapterAndDeclaration.Super { - public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public abstract fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public abstract fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.txt index 66a1df2f265..655799b98dc 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.txt @@ -3,16 +3,16 @@ package test public trait InheritedAmbiguousAdapters : java.lang.Object { public trait Sub : test.InheritedAmbiguousAdapters.Super { - public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.io.Closeable?): jet.Unit - public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } public trait Super : java.lang.Object { - public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public abstract fun foo(/*0*/ p0: java.io.Closeable?): jet.Unit - public abstract fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public abstract fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit + public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.txt index 396c1dc3f3b..eb1909c283d 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.txt @@ -3,16 +3,16 @@ package test public trait InheritedAndOverriddenAmbiguousAdapters : java.lang.Object { public trait Sub : test.InheritedAndOverriddenAmbiguousAdapters.Super { - public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public final override /*1*/ /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.io.Closeable?): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public final override /*1*/ /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } public trait Super : java.lang.Object { - public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public abstract fun foo(/*0*/ p0: java.io.Closeable?): jet.Unit - public abstract fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public abstract fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit + public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.txt index 4bdb829be47..3dd91b5d815 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.txt @@ -4,13 +4,13 @@ public trait InheritedOverridden : java.lang.Object { public open class Sub : test.InheritedOverridden.Super { public constructor Sub() - public final override /*1*/ /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public open override /*1*/ fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public final override /*1*/ /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public open override /*1*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } public open class Super : java.lang.Object { public constructor Super() - public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public open fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public open fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.java b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.java index 824fa9b6588..7096030a1e6 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.java +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.java @@ -7,7 +7,7 @@ public interface InheritedOverriddenAdapter { } public class Sub extends Super { - public void foo(jet.Function0 r) { + public void foo(kotlin.Function0 r) { } } } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.txt index fc0ae4d9ffe..31c035e356f 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.txt @@ -4,13 +4,13 @@ public trait InheritedOverriddenAdapter : java.lang.Object { public open class Sub : test.InheritedOverriddenAdapter.Super { public constructor Sub() - public open override /*1*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public open override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public open override /*1*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } public open class Super : java.lang.Object { public constructor Super() - public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public open fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public open fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.txt index 2f6b1b25832..c9dd78146ec 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.txt @@ -3,23 +3,23 @@ package test public trait InheritedSameAdapters : java.lang.Object { public trait Sub : test.InheritedSameAdapters.Super1, test.InheritedSameAdapters.Super2 { - public final override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public final override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } public trait Super1 : java.lang.Object { - public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public abstract fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } public trait Super2 : java.lang.Object { - public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public abstract fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } } package test.InheritedSameAdapters { - public /*synthesized*/ fun Sub(/*0*/ function: (java.lang.Runnable?) -> jet.Unit): test.InheritedSameAdapters.Sub - public /*synthesized*/ fun Super1(/*0*/ function: (java.lang.Runnable?) -> jet.Unit): test.InheritedSameAdapters.Super1 - public /*synthesized*/ fun Super2(/*0*/ function: (java.lang.Runnable?) -> jet.Unit): test.InheritedSameAdapters.Super2 + public /*synthesized*/ fun Sub(/*0*/ function: (java.lang.Runnable?) -> kotlin.Unit): test.InheritedSameAdapters.Sub + public /*synthesized*/ fun Super1(/*0*/ function: (java.lang.Runnable?) -> kotlin.Unit): test.InheritedSameAdapters.Super1 + public /*synthesized*/ fun Super2(/*0*/ function: (java.lang.Runnable?) -> kotlin.Unit): test.InheritedSameAdapters.Super2 } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.txt index c886399a5e5..db1cd5683e9 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.txt @@ -3,29 +3,29 @@ package test public trait InheritedSameAdaptersWithSubstitution : java.lang.Object { public trait Sub : test.InheritedSameAdaptersWithSubstitution.Super1, test.InheritedSameAdaptersWithSubstitution.Super2Substituted { - public final override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: ((jet.String, jet.String) -> jet.Int)?): jet.Unit - public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: java.util.Comparator?): jet.Unit + public final override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: ((kotlin.String, kotlin.String) -> kotlin.Int)?): kotlin.Unit + public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: java.util.Comparator?): kotlin.Unit } public trait Super1 : java.lang.Object { - public final /*synthesized*/ fun foo(/*0*/ p0: ((jet.String, jet.String) -> jet.Int)?): jet.Unit - public abstract fun foo(/*0*/ p0: java.util.Comparator?): jet.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: ((kotlin.String, kotlin.String) -> kotlin.Int)?): kotlin.Unit + public abstract fun foo(/*0*/ p0: java.util.Comparator?): kotlin.Unit } public trait Super2 : java.lang.Object { - public final /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> jet.Int)?): jet.Unit - public abstract fun foo(/*0*/ p0: java.util.Comparator?): jet.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> kotlin.Int)?): kotlin.Unit + public abstract fun foo(/*0*/ p0: java.util.Comparator?): kotlin.Unit } - public trait Super2Substituted : test.InheritedSameAdaptersWithSubstitution.Super2 { - public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: ((jet.String, jet.String) -> jet.Int)?): jet.Unit - public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.util.Comparator?): jet.Unit + public trait Super2Substituted : test.InheritedSameAdaptersWithSubstitution.Super2 { + public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: ((kotlin.String, kotlin.String) -> kotlin.Int)?): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.util.Comparator?): kotlin.Unit } } package test.InheritedSameAdaptersWithSubstitution { - public /*synthesized*/ fun Sub(/*0*/ function: (java.util.Comparator?) -> jet.Unit): test.InheritedSameAdaptersWithSubstitution.Sub - public /*synthesized*/ fun Super1(/*0*/ function: (java.util.Comparator?) -> jet.Unit): test.InheritedSameAdaptersWithSubstitution.Super1 - public /*synthesized*/ fun Super2(/*0*/ function: (java.util.Comparator?) -> jet.Unit): test.InheritedSameAdaptersWithSubstitution.Super2 - public /*synthesized*/ fun Super2Substituted(/*0*/ function: (java.util.Comparator?) -> jet.Unit): test.InheritedSameAdaptersWithSubstitution.Super2Substituted + public /*synthesized*/ fun Sub(/*0*/ function: (java.util.Comparator?) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Sub + public /*synthesized*/ fun Super1(/*0*/ function: (java.util.Comparator?) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Super1 + public /*synthesized*/ fun Super2(/*0*/ function: (java.util.Comparator?) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Super2 + public /*synthesized*/ fun Super2Substituted(/*0*/ function: (java.util.Comparator?) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Super2Substituted } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.txt index 975722f4a6e..a7c180d9341 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.txt @@ -3,17 +3,17 @@ package test public trait InheritedSimple : java.lang.Object { public trait Sub : test.InheritedSimple.Super { - public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } public trait Super : java.lang.Object { - public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public abstract fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } } package test.InheritedSimple { - public /*synthesized*/ fun Sub(/*0*/ function: (java.lang.Runnable?) -> jet.Unit): test.InheritedSimple.Sub - public /*synthesized*/ fun Super(/*0*/ function: (java.lang.Runnable?) -> jet.Unit): test.InheritedSimple.Super + public /*synthesized*/ fun Sub(/*0*/ function: (java.lang.Runnable?) -> kotlin.Unit): test.InheritedSimple.Sub + public /*synthesized*/ fun Super(/*0*/ function: (java.lang.Runnable?) -> kotlin.Unit): test.InheritedSimple.Super } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.java b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.java index 08409d2c53d..2006e77772a 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.java +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.java @@ -9,6 +9,6 @@ public interface OverriddenAmbiguousAdapters { } public interface Sub extends Super { - void foo(jet.Function0 r); + void foo(kotlin.Function0 r); } } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.txt index 1796c58440b..de243610c17 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.txt @@ -3,15 +3,15 @@ package test public trait OverriddenAmbiguousAdapters : java.lang.Object { public trait Sub : test.OverriddenAmbiguousAdapters.Super { - public abstract override /*2*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.io.Closeable?): jet.Unit - public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public abstract override /*2*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } public trait Super : java.lang.Object { - public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit - public abstract fun foo(/*0*/ p0: java.io.Closeable?): jet.Unit - public abstract fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit + public abstract fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit + public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt index e28f7bf4c0c..11d229e6c45 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt @@ -3,14 +3,14 @@ package test public trait ArraysInSubtypes : java.lang.Object { public trait Sub : test.ArraysInSubtypes.Super { - public abstract override /*1*/ fun array(): jet.Array? - public abstract override /*1*/ fun listOfArray(): jet.MutableList?>? - public abstract override /*1*/ fun objArray(): jet.Array? + public abstract override /*1*/ fun array(): kotlin.Array? + public abstract override /*1*/ fun listOfArray(): kotlin.MutableList?>? + public abstract override /*1*/ fun objArray(): kotlin.Array? } public trait Super : java.lang.Object { - public abstract fun array(): jet.Array? - public abstract fun listOfArray(): jet.MutableList?>? - public abstract fun objArray(): jet.Array? + public abstract fun array(): kotlin.Array? + public abstract fun listOfArray(): kotlin.MutableList?>? + public abstract fun objArray(): kotlin.Array? } } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt index 8f68743f10b..b650d9f6dcf 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt @@ -6,7 +6,7 @@ public trait MethodTypeParameterErased : java.lang.Object { public abstract fun ?> save(): RET? } - public open class SubBug : test.MethodTypeParameterErased.Bug { + public open class SubBug : test.MethodTypeParameterErased.Bug { public constructor SubBug() public open fun save(): test.MethodTypeParameterErased.SubBug? } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt index 0dccec2e908..676b1e3e5a5 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt @@ -3,16 +3,16 @@ package test public open class RawSuperType : java.lang.Object { public constructor RawSuperType() - public open inner class Derived : test.RawSuperType.Super { + public open inner class Derived : test.RawSuperType.Super { public constructor Derived() - public open override /*1*/ fun foo(/*0*/ p0: jet.Any?): jet.Unit + public open override /*1*/ fun foo(/*0*/ p0: kotlin.Any?): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun foo(/*0*/ p0: T?): jet.Unit + public abstract fun foo(/*0*/ p0: T?): kotlin.Unit } } package test.RawSuperType { - public /*synthesized*/ fun Super(/*0*/ function: (T?) -> jet.Unit): test.RawSuperType.Super + public /*synthesized*/ fun Super(/*0*/ function: (T?) -> kotlin.Unit): test.RawSuperType.Super } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt index 32bf28713a5..1b8ae653e68 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt @@ -3,24 +3,24 @@ package test public trait SubclassWithRawType : java.lang.Object { public trait Sub : test.SubclassWithRawType.Super { - public abstract override /*1*/ fun array1(): jet.Array>? - public abstract override /*1*/ fun array2(): jet.Array>? - public abstract override /*1*/ fun boundWildcard1(): jet.MutableList?>? - public abstract override /*1*/ fun boundWildcard2(): jet.MutableList?>? - public abstract override /*1*/ fun simple1(): jet.MutableList? - public abstract override /*1*/ fun simple2(): jet.MutableList?>? - public abstract override /*1*/ fun simple3(): jet.MutableList? - public abstract override /*1*/ fun wildcard(): jet.MutableList? + public abstract override /*1*/ fun array1(): kotlin.Array>? + public abstract override /*1*/ fun array2(): kotlin.Array>? + public abstract override /*1*/ fun boundWildcard1(): kotlin.MutableList?>? + public abstract override /*1*/ fun boundWildcard2(): kotlin.MutableList?>? + public abstract override /*1*/ fun simple1(): kotlin.MutableList? + public abstract override /*1*/ fun simple2(): kotlin.MutableList?>? + public abstract override /*1*/ fun simple3(): kotlin.MutableList? + public abstract override /*1*/ fun wildcard(): kotlin.MutableList? } public trait Super : java.lang.Object { - public abstract fun array1(): jet.Array>? - public abstract fun array2(): jet.Array>? - public abstract fun boundWildcard1(): jet.MutableList?>? - public abstract fun boundWildcard2(): jet.MutableList?>? - public abstract fun simple1(): jet.MutableList? - public abstract fun simple2(): jet.MutableList? - public abstract fun simple3(): jet.MutableList? - public abstract fun wildcard(): jet.MutableList? + public abstract fun array1(): kotlin.Array>? + public abstract fun array2(): kotlin.Array>? + public abstract fun boundWildcard1(): kotlin.MutableList?>? + public abstract fun boundWildcard2(): kotlin.MutableList?>? + public abstract fun simple1(): kotlin.MutableList? + public abstract fun simple2(): kotlin.MutableList? + public abstract fun simple3(): kotlin.MutableList? + public abstract fun wildcard(): kotlin.MutableList? } } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt index 937053480a0..9da27950611 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt @@ -1,20 +1,20 @@ package test -public /*synthesized*/ fun TwoSuperclassesInconsistentGenericTypes(/*0*/ function: () -> jet.MutableList): test.TwoSuperclassesInconsistentGenericTypes +public /*synthesized*/ fun TwoSuperclassesInconsistentGenericTypes(/*0*/ function: () -> kotlin.MutableList): test.TwoSuperclassesInconsistentGenericTypes public trait TwoSuperclassesInconsistentGenericTypes : java.lang.Object { - public abstract fun foo(): jet.MutableList + public abstract fun foo(): kotlin.MutableList public trait Other : java.lang.Object { - public abstract fun foo(): jet.MutableList? + public abstract fun foo(): kotlin.MutableList? } public open class Sub : test.TwoSuperclassesInconsistentGenericTypes, test.TwoSuperclassesInconsistentGenericTypes.Other { public constructor Sub() - public open override /*2*/ fun foo(): jet.MutableList + public open override /*2*/ fun foo(): kotlin.MutableList } } package test.TwoSuperclassesInconsistentGenericTypes { - public /*synthesized*/ fun Other(/*0*/ function: () -> jet.MutableList?): test.TwoSuperclassesInconsistentGenericTypes.Other + public /*synthesized*/ fun Other(/*0*/ function: () -> kotlin.MutableList?): test.TwoSuperclassesInconsistentGenericTypes.Other } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt index 2ea62cc49c9..add74b80598 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt @@ -3,20 +3,20 @@ package test public trait TwoSuperclassesVarargAndNot : java.lang.Object { public trait Sub : test.TwoSuperclassesVarargAndNot.Super1, test.TwoSuperclassesVarargAndNot.Super2 { - public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ vararg p0: jet.String? /*jet.Array*/): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: jet.Array?): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array*/): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array?): kotlin.Unit } public trait Super1 : java.lang.Object { - public abstract fun foo(/*0*/ vararg p0: jet.String? /*jet.Array*/): jet.Unit + public abstract fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array*/): kotlin.Unit } public trait Super2 : java.lang.Object { - public abstract fun foo(/*0*/ p0: jet.Array?): jet.Unit + public abstract fun foo(/*0*/ p0: kotlin.Array?): kotlin.Unit } } package test.TwoSuperclassesVarargAndNot { - public /*synthesized*/ fun Super1(/*0*/ function: (jet.Array) -> jet.Unit): test.TwoSuperclassesVarargAndNot.Super1 - public /*synthesized*/ fun Super2(/*0*/ function: (jet.Array?) -> jet.Unit): test.TwoSuperclassesVarargAndNot.Super2 + public /*synthesized*/ fun Super1(/*0*/ function: (kotlin.Array) -> kotlin.Unit): test.TwoSuperclassesVarargAndNot.Super1 + public /*synthesized*/ fun Super2(/*0*/ function: (kotlin.Array?) -> kotlin.Unit): test.TwoSuperclassesVarargAndNot.Super2 } diff --git a/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.txt b/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.txt index 965fddfe884..65f9ba3ed3a 100644 --- a/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.txt +++ b/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.txt @@ -5,15 +5,15 @@ public open class DeeplyInnerClass : java.lang.Object { public/*package*/ open inner class A : java.lang.Object { public/*package*/ constructor A() - public/*package*/ open fun a(): jet.Unit + public/*package*/ open fun a(): kotlin.Unit public/*package*/ open inner class B : java.lang.Object { public/*package*/ constructor B() - public/*package*/ open fun b(): jet.Unit + public/*package*/ open fun b(): kotlin.Unit public/*package*/ open inner class C : java.lang.Object { public/*package*/ constructor C() - public/*package*/ open fun c(): jet.Unit + public/*package*/ open fun c(): kotlin.Unit } } } diff --git a/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.txt b/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.txt index 7dc6f50ddc5..e6d18bc6c6b 100644 --- a/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.txt +++ b/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.txt @@ -17,7 +17,7 @@ package test.DeeplyNestedStatic { package test.DeeplyNestedStatic.Foo { package test.DeeplyNestedStatic.Foo.Bar { - public open fun method(): jet.Unit + public open fun method(): kotlin.Unit } } } diff --git a/compiler/testData/loadJava/compiledJava/static/Enum.txt b/compiler/testData/loadJava/compiledJava/static/Enum.txt index 203c6048549..ccff68ce313 100644 --- a/compiler/testData/loadJava/compiledJava/static/Enum.txt +++ b/compiler/testData/loadJava/compiledJava/static/Enum.txt @@ -1,61 +1,61 @@ package test -public final enum class Enum : jet.Enum { +public final enum class Enum : kotlin.Enum { private constructor Enum() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object { private constructor () - public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.Enum - public final /*synthesized*/ fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Enum + public final /*synthesized*/ fun values(): kotlin.Array } public enum entry A : test.Enum { private constructor A() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object : test.Enum.A { private constructor () - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int } } public enum entry B : test.Enum { private constructor B() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object : test.Enum.B { private constructor () - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int } } public enum entry C : test.Enum { private constructor C() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object : test.Enum.C { private constructor () - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int } } public open inner class Inner : java.lang.Object { public constructor Inner() - public/*package*/ open fun bar(): jet.Unit - public/*package*/ open fun valueOf(/*0*/ p0: jet.String?): jet.Unit + public/*package*/ open fun bar(): kotlin.Unit + public/*package*/ open fun valueOf(/*0*/ p0: kotlin.String?): kotlin.Unit } public open class Nested : java.lang.Object { public constructor Nested() - public/*package*/ open fun foo(): jet.Unit - public/*package*/ open fun values(): jet.Unit + public/*package*/ open fun foo(): kotlin.Unit + public/*package*/ open fun values(): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/static/InnerClass.txt b/compiler/testData/loadJava/compiledJava/static/InnerClass.txt index 0a73c937646..f01a10e1b61 100644 --- a/compiler/testData/loadJava/compiledJava/static/InnerClass.txt +++ b/compiler/testData/loadJava/compiledJava/static/InnerClass.txt @@ -5,11 +5,11 @@ public open class InnerClass : java.lang.Object { public open inner class Inner : java.lang.Object { public constructor Inner() - public open fun foo(): jet.Unit + public open fun foo(): kotlin.Unit } public open class Nested : java.lang.Object { public constructor Nested() - public open fun bar(): jet.Unit + public open fun bar(): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/static/Simple.txt b/compiler/testData/loadJava/compiledJava/static/Simple.txt index a4616267da5..3bf40d7c9a5 100644 --- a/compiler/testData/loadJava/compiledJava/static/Simple.txt +++ b/compiler/testData/loadJava/compiledJava/static/Simple.txt @@ -2,9 +2,9 @@ package test public open class Simple : java.lang.Object { public constructor Simple() - public open fun foo(): jet.Unit + public open fun foo(): kotlin.Unit } package test.Simple { - public open fun bar(): jet.Unit + public open fun bar(): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/static/StaticFinal.txt b/compiler/testData/loadJava/compiledJava/static/StaticFinal.txt index d10b522d798..300b7404b48 100644 --- a/compiler/testData/loadJava/compiledJava/static/StaticFinal.txt +++ b/compiler/testData/loadJava/compiledJava/static/StaticFinal.txt @@ -5,5 +5,5 @@ public open class StaticFinal : java.lang.Object { } package test.StaticFinal { - public val foo: jet.String + public val foo: kotlin.String } diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt index 9043b3d21eb..d87f7b96d99 100644 --- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt +++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt @@ -1,33 +1,33 @@ package test -public final enum class StaticMembersInEnum : jet.Enum { +public final enum class StaticMembersInEnum : kotlin.Enum { private constructor StaticMembersInEnum() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object { private constructor () - public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.StaticMembersInEnum - public final /*synthesized*/ fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.StaticMembersInEnum + public final /*synthesized*/ fun values(): kotlin.Array } public enum entry ENTRY : test.StaticMembersInEnum { private constructor ENTRY() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object : test.StaticMembersInEnum.ENTRY { private constructor () - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int } } } package test.StaticMembersInEnum { public val CONSTANT: test.StaticMembersInEnum - public var STATIC_FIELD: jet.Int - public open fun foo(): jet.Unit - public open fun valueOf(/*0*/ p0: jet.Int): jet.Unit - public open fun values(/*0*/ p0: jet.Int): jet.Unit + public var STATIC_FIELD: kotlin.Int + public open fun foo(): kotlin.Unit + public open fun valueOf(/*0*/ p0: kotlin.Int): kotlin.Unit + public open fun values(/*0*/ p0: kotlin.Int): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaAndKotlin/MixedPackage.txt b/compiler/testData/loadJava/compiledJavaAndKotlin/MixedPackage.txt index 3d9038d88b8..972f74760a0 100644 --- a/compiler/testData/loadJava/compiledJavaAndKotlin/MixedPackage.txt +++ b/compiler/testData/loadJava/compiledJavaAndKotlin/MixedPackage.txt @@ -1,11 +1,11 @@ package test -public /*synthesized*/ fun SamInterface(/*0*/ function: () -> jet.Unit): test.SamInterface -public fun topLevelFunction(): jet.Unit +public /*synthesized*/ fun SamInterface(/*0*/ function: () -> kotlin.Unit): test.SamInterface +public fun topLevelFunction(): kotlin.Unit public open class JavaClass : java.lang.Object { public constructor JavaClass() - public open fun instanceMethod(): jet.Unit + public open fun instanceMethod(): kotlin.Unit } public final class KotlinClass { @@ -13,21 +13,21 @@ public final class KotlinClass { } public trait SamInterface : java.lang.Object { - public abstract fun instanceMethod(): jet.Unit + public abstract fun instanceMethod(): kotlin.Unit } package test.JavaClass { - public open fun staticMethod(): jet.Unit + public open fun staticMethod(): kotlin.Unit } package test.sub { public open class JavaClassInSubpackage : java.lang.Object { public constructor JavaClassInSubpackage() - public open fun instanceMethod(): jet.Unit + public open fun instanceMethod(): kotlin.Unit } package test.sub.JavaClassInSubpackage { - public open fun staticMethod(): jet.Unit + public open fun staticMethod(): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ArrayTypeVariance.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ArrayTypeVariance.txt index dd2a9997b85..6a6b8115171 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ArrayTypeVariance.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ArrayTypeVariance.txt @@ -2,5 +2,5 @@ package test public final class ArrayTypeVariance : java.lang.Object { public constructor ArrayTypeVariance() - public final fun toArray(/*0*/ p0: jet.Array?): jet.Array? + public final fun toArray(/*0*/ p0: kotlin.Array?): kotlin.Array? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassDoesNotOverrideMethod.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassDoesNotOverrideMethod.txt index 7fe392d2dec..4d6e366286b 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassDoesNotOverrideMethod.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassDoesNotOverrideMethod.txt @@ -2,25 +2,25 @@ package test public abstract class ClassDoesNotOverrideMethod : java.util.Date { public constructor ClassDoesNotOverrideMethod() - public open override /*1*/ /*fake_override*/ fun after(/*0*/ p0: java.util.Date): jet.Boolean - public open override /*1*/ /*fake_override*/ fun before(/*0*/ p0: java.util.Date): jet.Boolean - public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ p0: java.util.Date): jet.Int - jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun getDate(): jet.Int - jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun getDay(): jet.Int - jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun getHours(): jet.Int - jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun getMinutes(): jet.Int - jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun getMonth(): jet.Int - jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun getSeconds(): jet.Int - public open override /*1*/ /*fake_override*/ fun getTime(): jet.Long - jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun getTimezoneOffset(): jet.Int - jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun getYear(): jet.Int - jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0: jet.Int): jet.Unit - jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0: jet.Int): jet.Unit - jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0: jet.Int): jet.Unit - jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun setMonth(/*0*/ p0: jet.Int): jet.Unit - jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0: jet.Int): jet.Unit - public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ p0: jet.Long): jet.Unit - jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0: jet.Int): jet.Unit - jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun toGMTString(): jet.String - jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun toLocaleString(): jet.String + public open override /*1*/ /*fake_override*/ fun after(/*0*/ p0: java.util.Date): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun before(/*0*/ p0: java.util.Date): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ p0: java.util.Date): kotlin.Int + kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getDate(): kotlin.Int + kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getDay(): kotlin.Int + kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getHours(): kotlin.Int + kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getMinutes(): kotlin.Int + kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getMonth(): kotlin.Int + kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getSeconds(): kotlin.Int + public open override /*1*/ /*fake_override*/ fun getTime(): kotlin.Long + kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getTimezoneOffset(): kotlin.Int + kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getYear(): kotlin.Int + kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0: kotlin.Int): kotlin.Unit + kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0: kotlin.Int): kotlin.Unit + kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0: kotlin.Int): kotlin.Unit + kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setMonth(/*0*/ p0: kotlin.Int): kotlin.Unit + kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0: kotlin.Int): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ p0: kotlin.Long): kotlin.Unit + kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0: kotlin.Int): kotlin.Unit + kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun toGMTString(): kotlin.String + kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun toLocaleString(): kotlin.String } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePExtendsIterableP.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePExtendsIterableP.kt index b3d331d9e4d..3169bd99d9e 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePExtendsIterableP.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePExtendsIterableP.kt @@ -1,4 +1,4 @@ package test -public abstract class ClassWithTypePExtendsIterableP

() : jet.MutableIterable

{ +public abstract class ClassWithTypePExtendsIterableP

() : kotlin.MutableIterable

{ } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePExtendsIterableP.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePExtendsIterableP.txt index ab5070fb1f4..e0c5ecb760f 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePExtendsIterableP.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePExtendsIterableP.txt @@ -1,6 +1,6 @@ package test -public abstract class ClassWithTypePExtendsIterableP : jet.MutableIterable

{ +public abstract class ClassWithTypePExtendsIterableP : kotlin.MutableIterable

{ public constructor ClassWithTypePExtendsIterableP() - public abstract override /*1*/ /*fake_override*/ fun iterator(): jet.MutableIterator

+ public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator

} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.kt index f5b75f154fe..153bf75a30e 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.kt @@ -1,3 +1,3 @@ package test -public open class ClassWithTypePRefNext?, P>() : java.lang.Object() +public open class ClassWithTypePRefNext?, P>() : java.lang.Object() diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.txt index 29febd605ff..90a1afc7fa8 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.txt @@ -1,5 +1,5 @@ package test -public open class ClassWithTypePRefNext?, /*1*/ P> : java.lang.Object { - public constructor ClassWithTypePRefNext?, /*1*/ P>() +public open class ClassWithTypePRefNext?, /*1*/ P> : java.lang.Object { + public constructor ClassWithTypePRefNext?, /*1*/ P>() } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.kt index 8e5dd064f4d..a8976a5d089 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.kt @@ -1,4 +1,4 @@ package test -public class ClassWithTypePRefSelf

?>() : java.lang.Object() { +public class ClassWithTypePRefSelf

?>() : java.lang.Object() { } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.txt index b8ece0caf99..b90a5a7a0ae 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.txt @@ -1,5 +1,5 @@ package test -public final class ClassWithTypePRefSelf?> : java.lang.Object { - public constructor ClassWithTypePRefSelf?>() +public final class ClassWithTypePRefSelf?> : java.lang.Object { + public constructor ClassWithTypePRefSelf?>() } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldAsVar.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldAsVar.txt index ee4bf0b0578..e26e6f8a219 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldAsVar.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldAsVar.txt @@ -2,5 +2,5 @@ package test public final class FieldAsVar : java.lang.Object { public constructor FieldAsVar() - public final var f: jet.Int + public final var f: kotlin.Int } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldOfArrayType.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldOfArrayType.txt index c753f95ae58..7b1f2c69b6e 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldOfArrayType.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldOfArrayType.txt @@ -2,5 +2,5 @@ package test public open class FieldOfArrayType : java.lang.Object { public constructor FieldOfArrayType() - public final var files: jet.Array? + public final var files: kotlin.Array? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FinalFieldAsVal.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FinalFieldAsVal.txt index 8e133156a5d..6201759a2b1 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FinalFieldAsVal.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FinalFieldAsVal.txt @@ -2,5 +2,5 @@ package test public final class FinalFieldAsVal : java.lang.Object { public constructor FinalFieldAsVal() - public final val f: jet.Int + public final val f: kotlin.Int } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypes.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypes.txt index a885a84160d..54d6c8bfa97 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypes.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypes.txt @@ -4,17 +4,17 @@ public final class InheritMethodsDifferentReturnTypes : java.lang.Object { public constructor InheritMethodsDifferentReturnTypes() public trait Sub : test.InheritMethodsDifferentReturnTypes.Super1, test.InheritMethodsDifferentReturnTypes.Super2 { - public abstract override /*2*/ /*fake_override*/ fun bar(): jet.String? - public abstract override /*2*/ /*fake_override*/ fun foo(): jet.String? + public abstract override /*2*/ /*fake_override*/ fun bar(): kotlin.String? + public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.String? } public trait Super1 : java.lang.Object { - public abstract fun bar(): jet.String? - public abstract fun foo(): jet.CharSequence? + public abstract fun bar(): kotlin.String? + public abstract fun foo(): kotlin.CharSequence? } public trait Super2 : java.lang.Object { - public abstract fun bar(): jet.CharSequence? - public abstract fun foo(): jet.String? + public abstract fun bar(): kotlin.CharSequence? + public abstract fun foo(): kotlin.String? } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypesGeneric.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypesGeneric.txt index d4bb464002c..1d806f33770 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypesGeneric.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypesGeneric.txt @@ -3,9 +3,9 @@ package test public final class InheritMethodsDifferentReturnTypesGeneric : java.lang.Object { public constructor InheritMethodsDifferentReturnTypesGeneric() - public trait Sub : test.InheritMethodsDifferentReturnTypesGeneric.Super1, test.InheritMethodsDifferentReturnTypesGeneric.Super2 { - public abstract override /*2*/ /*fake_override*/ fun bar(): jet.String? - public abstract override /*2*/ /*fake_override*/ fun foo(): jet.String? + public trait Sub : test.InheritMethodsDifferentReturnTypesGeneric.Super1, test.InheritMethodsDifferentReturnTypesGeneric.Super2 { + public abstract override /*2*/ /*fake_override*/ fun bar(): kotlin.String? + public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.String? } public trait Super1 : java.lang.Object { diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.kt index 28063029da9..2ad6c40437b 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.kt @@ -5,7 +5,7 @@ public open class InnerClassesInGeneric() : java.lang.Object() { } public open inner class Inner2() : Inner() { - public open fun iterator() : jet.MutableIterator

? { + public open fun iterator() : kotlin.MutableIterator

? { throw UnsupportedOperationException() } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.txt index d204ceacd7d..56f18a212bf 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.txt @@ -9,6 +9,6 @@ public open class InnerClassesInGeneric : java.lang.Object { public open inner class Inner2 : test.InnerClassesInGeneric.Inner { public constructor Inner2() - public open fun iterator(): jet.MutableIterator

? + public open fun iterator(): kotlin.MutableIterator

? } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.txt index 163559807b6..d9b0259967f 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.txt @@ -5,6 +5,6 @@ public final class MethodReferencesOuterClassTP : java.lang.Object { public final inner class Inner : java.lang.Object { public constructor Inner() - public final fun f(): jet.Unit + public final fun f(): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.txt index 958312f5766..5e65b8202b5 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.txt @@ -2,5 +2,5 @@ package test public open class MethodTypePOneUpperBound : java.lang.Object { public constructor MethodTypePOneUpperBound() - public open fun bar(): jet.Unit + public open fun bar(): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.txt index 2b8b831114e..2bfbc882910 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.txt @@ -2,5 +2,5 @@ package test public open class MethodTypePTwoUpperBounds : java.lang.Object { public constructor MethodTypePTwoUpperBounds() - public open fun foo(): jet.Unit where T : java.lang.Runnable? + public open fun foo(): kotlin.Unit where T : java.lang.Runnable? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.txt index 3e63843d69b..2aae33107cb 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.txt @@ -2,5 +2,5 @@ package test public final class MethodWithTypeP : java.lang.Object { public constructor MethodWithTypeP() - public final fun f(): jet.Unit + public final fun f(): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.txt index b106bc19d69..2afcccfa658 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.txt @@ -2,5 +2,5 @@ package test public final class MethodWithTypePP : java.lang.Object { public constructor MethodWithTypePP() - public final fun f(): jet.Unit + public final fun f(): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.txt index c24742a5437..1d867c941e0 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.txt @@ -2,5 +2,5 @@ package test public open class MethodWithTypePRefClassP : java.lang.Object { public constructor MethodWithTypePRefClassP() - public final fun f(): jet.Unit + public final fun f(): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.txt index 6ee7af61004..95362596565 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.txt @@ -2,5 +2,5 @@ package test public final class MethosWithPRefTP : java.lang.Object { public constructor MethosWithPRefTP() - public final fun f(/*0*/ p0: P?): jet.Unit + public final fun f(/*0*/ p0: P?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MyException.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MyException.txt index 1fb4c26c62d..503e865981a 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MyException.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MyException.txt @@ -1,5 +1,5 @@ package test public open class MyException : java.lang.Object { - public constructor MyException(/*0*/ p0: jet.String?, /*1*/ p1: jet.Throwable?) + public constructor MyException(/*0*/ p0: kotlin.String?, /*1*/ p1: kotlin.Throwable?) } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.txt index d2f5754370a..6f3f7dec7e7 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.txt @@ -1,6 +1,6 @@ package test public trait RemoveRedundantProjectionKind : java.lang.Object { - public abstract fun f(/*0*/ p0: jet.Collection?): jet.Unit - public abstract fun f(/*0*/ p0: jet.Comparable?): jet.Unit + public abstract fun f(/*0*/ p0: kotlin.Collection?): kotlin.Unit + public abstract fun f(/*0*/ p0: kotlin.Comparable?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/TwoFields.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/TwoFields.txt index 40cc47aceaf..e63e8834685 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/TwoFields.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/TwoFields.txt @@ -2,6 +2,6 @@ package test public final class TwoFields : java.lang.Object { public constructor TwoFields() - public final var a: jet.Int - public final var b: jet.Short + public final var a: kotlin.Int + public final var b: kotlin.Short } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/UnboundWildcard.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/UnboundWildcard.txt index 881a1f7821b..b844879192d 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/UnboundWildcard.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/UnboundWildcard.txt @@ -2,8 +2,8 @@ package test public final class UnboundWildcard : java.lang.Object { public constructor UnboundWildcard() - public final fun foo(): test.UnboundWildcard.MyClass? + public final fun foo(): test.UnboundWildcard.MyClass? - public trait MyClass : java.lang.Object { + public trait MyClass : java.lang.Object { } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedAnnotation.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedAnnotation.txt index 924d5214643..f96ba4792ab 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedAnnotation.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedAnnotation.txt @@ -1,5 +1,5 @@ package test -test.AnnotatedAnnotation() public final annotation class AnnotatedAnnotation : jet.Annotation { +test.AnnotatedAnnotation() public final annotation class AnnotatedAnnotation : kotlin.Annotation { public constructor AnnotatedAnnotation() } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.txt index 6b45ade168e..5e05bb75e97 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.txt @@ -2,5 +2,5 @@ package test public open class AnnotatedMethod : java.lang.Object { public constructor AnnotatedMethod() - jet.deprecated(value = "Deprecated in Java": jet.String) public open fun f(): jet.Unit + kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open fun f(): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/SimpleAnnotation.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/SimpleAnnotation.txt index b3532ba6858..b53630f497e 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/SimpleAnnotation.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/SimpleAnnotation.txt @@ -1,5 +1,5 @@ package test -public final annotation class SimpleAnnotation : jet.Annotation { +public final annotation class SimpleAnnotation : kotlin.Annotation { public constructor SimpleAnnotation() } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericDeep.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericDeep.txt index e0a9b3b7f14..52772056d1e 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericDeep.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericDeep.txt @@ -1,5 +1,5 @@ package test public open class ConstructorGenericDeep : java.lang.Object { - public constructor ConstructorGenericDeep(/*0*/ p0: java.lang.Class?) + public constructor ConstructorGenericDeep(/*0*/ p0: java.lang.Class?) } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericSimple.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericSimple.txt index 54fe62cf9f4..d7ac74fb4f1 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericSimple.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericSimple.txt @@ -1,5 +1,5 @@ package test public open class ConstructorGenericSimple : java.lang.Object { - public constructor ConstructorGenericSimple(/*0*/ p0: jet.Any?) + public constructor ConstructorGenericSimple(/*0*/ p0: kotlin.Any?) } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.txt index f5508b031ab..178b8e76be6 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.txt @@ -2,6 +2,6 @@ package test public open class DifferentGetterAndSetter : java.lang.Object { public constructor DifferentGetterAndSetter() - public open fun getSomething(): jet.Int - public open fun setSomething(/*0*/ p0: jet.String?): jet.Unit + public open fun getSomething(): kotlin.Int + public open fun setSomething(/*0*/ p0: kotlin.String?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanAbstractGetter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanAbstractGetter.txt index c526e807a23..d286a41d8d6 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanAbstractGetter.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanAbstractGetter.txt @@ -1,6 +1,6 @@ package test public trait JavaBeanAbstractGetter : java.lang.Object { - public abstract fun getBlue(): jet.Int - public abstract fun getRed(): jet.Int + public abstract fun getBlue(): kotlin.Int + public abstract fun getRed(): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVal.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVal.txt index 2759baf689c..3e4d91c9043 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVal.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVal.txt @@ -2,5 +2,5 @@ package test public open class JavaBeanVal : java.lang.Object { public constructor JavaBeanVal() - public open fun getColor(): jet.String? + public open fun getColor(): kotlin.String? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.txt index 5d39b6179b3..97bb96b8990 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.txt @@ -2,6 +2,6 @@ package test public open class JavaBeanVar : java.lang.Object { public constructor JavaBeanVar() - public open fun getColor(): jet.String? - public open fun setColor(/*0*/ p0: jet.String?): jet.Unit + public open fun getColor(): kotlin.String? + public open fun setColor(/*0*/ p0: kotlin.String?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.txt index 2cf7ca177ee..d03826286bc 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.txt @@ -3,5 +3,5 @@ package test public open class JavaBeanVarOfGenericType : java.lang.Object { public constructor JavaBeanVarOfGenericType() public open fun getCharacters(): java.util.ArrayList

? - public open fun setCharacters(/*0*/ p0: java.util.ArrayList

?): jet.Unit + public open fun setCharacters(/*0*/ p0: java.util.ArrayList

?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.txt index a90ea8ecff0..e0d43de2917 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.txt @@ -2,6 +2,6 @@ package test public open class TwoSetters : java.lang.Object { public constructor TwoSetters() - public open fun setSize(/*0*/ p0: jet.Int): jet.Unit - public open fun setSize(/*0*/ p0: jet.String?): jet.Unit + public open fun setSize(/*0*/ p0: kotlin.Int): kotlin.Unit + public open fun setSize(/*0*/ p0: kotlin.String?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ArrayType.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ArrayType.txt index 664695566d2..5f68ba06d8e 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ArrayType.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ArrayType.txt @@ -2,5 +2,5 @@ package test public open class ArrayType : java.lang.Object { public constructor ArrayType() - public open fun foo(): jet.Array + public open fun foo(): kotlin.Array } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.java index 992bdcdc2a6..e3037c7574a 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.java @@ -7,4 +7,4 @@ public class ConstructorWithNewTypeParams { @KotlinSignature("fun ConstructorWithNewTypeParams(first : Any)") // TODO: first : U doesn't work public ConstructorWithNewTypeParams(U first) { } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.kt index fe3ac9d8d53..0ebbbeef413 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.kt @@ -1,4 +1,4 @@ package test public open class ConstructorWithNewTypeParams(p0 : Any) : java.lang.Object() { -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.txt index 3fdbb724a29..89ffb83d344 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.txt @@ -1,5 +1,5 @@ package test public open class ConstructorWithNewTypeParams : java.lang.Object { - public constructor ConstructorWithNewTypeParams(/*0*/ p0: jet.Any) + public constructor ConstructorWithNewTypeParams(/*0*/ p0: kotlin.Any) } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.java index 3e04f89e23e..ca90fbd0529 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.java @@ -7,4 +7,4 @@ public class ConstructorWithParentTypeParams { @KotlinSignature("fun ConstructorWithParentTypeParams(first: T)") public ConstructorWithParentTypeParams(T first) { } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.kt index db424036871..9f5d661a176 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.kt @@ -1,4 +1,4 @@ package test public open class ConstructorWithParentTypeParams(p0 : T) : java.lang.Object() { -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.java index 1b0ac8c04a2..bb3557a6daa 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.java @@ -7,4 +7,4 @@ public class ConstructorWithSeveralParams { @KotlinSignature("fun ConstructorWithSeveralParams(integer : Int, intField : Int, collection: ArrayList)") public ConstructorWithSeveralParams(Integer integer, int intBasic, ArrayList collection) { } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.kt index c53b66bf254..8b71addba0b 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.kt @@ -3,4 +3,4 @@ package test import java.util.* public open class ConstructorWithSeveralParams(p0: Int, p1 : Int, p2 : ArrayList) : java.lang.Object() { -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.txt index b65d98dc102..63344bfc275 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.txt @@ -1,5 +1,5 @@ package test public open class ConstructorWithSeveralParams : java.lang.Object { - public constructor ConstructorWithSeveralParams(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int, /*2*/ p2: java.util.ArrayList) + public constructor ConstructorWithSeveralParams(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int, /*2*/ p2: java.util.ArrayList) } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.java index a7a4cc9b165..bb7f11d07ff 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.java @@ -7,4 +7,4 @@ public class ConstructorWithoutParams { @KotlinSignature("fun ConstructorWithoutParams()") public ConstructorWithoutParams() { } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.kt index 5aae90c6c96..dc9e910fbbe 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.kt @@ -1,4 +1,4 @@ package test public open class ConstructorWithoutParams() : java.lang.Object() { -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/CustomProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/CustomProjectionKind.txt index 83af996eed5..7fcac2beb44 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/CustomProjectionKind.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/CustomProjectionKind.txt @@ -2,5 +2,5 @@ package test public open class CustomProjectionKind : java.lang.Object { public constructor CustomProjectionKind() - public open fun foo(): jet.MutableList + public open fun foo(): kotlin.MutableList } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.java index 9a3e70d6196..0c63b4abb02 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.java @@ -4,7 +4,7 @@ import java.lang.String; import java.lang.UnsupportedOperationException; import java.util.*; import jet.runtime.typeinfo.KotlinSignature; -import jet.*; +import kotlin.*; public class MethodWithFunctionTypes { @KotlinSignature("fun foo(f : (String?) -> String) : (String.() -> String?)?") diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.txt index 2bbf8bdc08a..5cc8c0b9d18 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.txt @@ -2,5 +2,5 @@ package test public open class MethodWithFunctionTypes : java.lang.Object { public constructor MethodWithFunctionTypes() - public open fun foo(/*0*/ p0: (jet.String?) -> jet.String): (jet.String.() -> jet.String?)? + public open fun foo(/*0*/ p0: (kotlin.String?) -> kotlin.String): (kotlin.String.() -> kotlin.String?)? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithGenerics.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithGenerics.txt index bad74b4f325..79783d95ee1 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithGenerics.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithGenerics.txt @@ -2,5 +2,5 @@ package test public open class MethodWithGenerics : java.lang.Object { public constructor MethodWithGenerics() - public open fun foo(/*0*/ p0: jet.String, /*1*/ p1: jet.List?>): jet.String + public open fun foo(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.List?>): kotlin.String } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.txt index 8a8bfe275d9..a39940523ad 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.txt @@ -2,5 +2,5 @@ package test public open class MethodWithMappedClasses : java.lang.Object { public constructor MethodWithMappedClasses() - public open fun copy(/*0*/ p0: jet.MutableList, /*1*/ p1: jet.List): jet.Unit + public open fun copy(/*0*/ p0: kotlin.MutableList, /*1*/ p1: kotlin.List): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.txt index bdeb812e08e..9a6c9a5941b 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.txt @@ -2,5 +2,5 @@ package test public open class MethodWithTypeParameters : java.lang.Object { public constructor MethodWithTypeParameters() - public open fun foo(/*0*/ p0: A, /*1*/ p1: jet.List, /*2*/ p2: jet.MutableList): jet.Unit where B : jet.List + public open fun foo(/*0*/ p0: A, /*1*/ p1: kotlin.List, /*2*/ p2: kotlin.MutableList): kotlin.Unit where B : kotlin.List } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.txt index ec2596d0ea9..0f241025d96 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.txt @@ -2,5 +2,5 @@ package test public open class MethodWithVararg : java.lang.Object { public constructor MethodWithVararg() - public open fun foo(/*0*/ vararg p0: jet.String /*jet.Array*/): jet.Unit + public open fun foo(/*0*/ vararg p0: kotlin.String /*kotlin.Array*/): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyArrayTypes.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyArrayTypes.txt index 674eb559a19..cb91eb4e74b 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyArrayTypes.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyArrayTypes.txt @@ -2,7 +2,7 @@ package test public open class PropertyArrayTypes : java.lang.Object { public constructor PropertyArrayTypes() - public final var array: jet.Array - public final var arrayOfArrays: jet.Array> - public final var genericArray: jet.Array + public final var array: kotlin.Array + public final var arrayOfArrays: kotlin.Array> + public final var genericArray: kotlin.Array } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyComplexTypes.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyComplexTypes.txt index 2d71e173e04..3e25f3390f8 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyComplexTypes.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyComplexTypes.txt @@ -3,7 +3,7 @@ package test public open class PropertyComplexTypes : java.lang.Object { public constructor PropertyComplexTypes() public final var genericType: T - public final var listDefinedGeneric: java.util.ArrayList + public final var listDefinedGeneric: java.util.ArrayList public final var listGeneric: java.util.ArrayList public final var listOfGenericList: java.util.ArrayList> } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertySimpleType.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertySimpleType.txt index 5b324d2a09c..ac7b8ed5eaf 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertySimpleType.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertySimpleType.txt @@ -2,6 +2,6 @@ package test public open class PropertySimpleType : java.lang.Object { public constructor PropertySimpleType() - public final var fieldOne: jet.String - public final var fieldTwo: jet.String? + public final var fieldOne: kotlin.String + public final var fieldTwo: kotlin.String? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/StarProjection.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/StarProjection.txt index 4f4b4deb76a..f3e06d90aa1 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/StarProjection.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/StarProjection.txt @@ -2,8 +2,8 @@ package test public final class StarProjection : java.lang.Object { public constructor StarProjection() - public final fun foo(): test.StarProjection.MyClass + public final fun foo(): test.StarProjection.MyClass - public trait MyClass : java.lang.Object { + public trait MyClass : java.lang.Object { } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.java index fa42b8e090e..beab177628d 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.java @@ -4,7 +4,7 @@ import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; public class AddingNullability { - @ExpectLoadError("Auto type 'jet.Int' is not-null, while type in alternative signature is nullable: 'Int?'") + @ExpectLoadError("Auto type 'kotlin.Int' is not-null, while type in alternative signature is nullable: 'Int?'") @KotlinSignature("fun foo() : Int?") public int foo() { throw new UnsupportedOperationException(); diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.txt index f8a25f70dc0..21134c09559 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.txt @@ -2,5 +2,5 @@ package test public open class AddingNullability : java.lang.Object { public constructor AddingNullability() - public open fun foo(): jet.Int + public open fun foo(): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.java index 503121326e0..7070779f0a6 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.java @@ -7,7 +7,7 @@ import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; public class ConflictingProjectionKind { - @ExpectLoadError("Projection kind 'in' is conflicting with variance of jet.List") + @ExpectLoadError("Projection kind 'in' is conflicting with variance of kotlin.List") @KotlinSignature("fun foo(list: List)") public void foo(List list) { throw new UnsupportedOperationException(); diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.txt index 354ecbbf5d2..bb84b122c4c 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.txt @@ -2,5 +2,5 @@ package test public open class ConflictingProjectionKind : java.lang.Object { public constructor ConflictingProjectionKind() - public open fun foo(/*0*/ p0: jet.List?): jet.Unit + public open fun foo(/*0*/ p0: kotlin.List?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt index 423f5a5e7d7..5ec7d3e9ade 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt @@ -2,5 +2,5 @@ package test public open class ExplicitFieldGettersAndSetters : java.lang.Object { public constructor ExplicitFieldGettersAndSetters() - public final var foo: jet.String? + public final var foo: kotlin.String? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExtraUpperBound.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExtraUpperBound.txt index 3d291a53fc7..7561ad865cb 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExtraUpperBound.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExtraUpperBound.txt @@ -2,5 +2,5 @@ package test public open class ExtraUpperBound : java.lang.Object { public constructor ExtraUpperBound() - public open fun foo(): jet.String? + public open fun foo(): kotlin.String? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/MissingUpperBound.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/MissingUpperBound.txt index c4651034cff..09d9f125dde 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/MissingUpperBound.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/MissingUpperBound.txt @@ -2,5 +2,5 @@ package test public open class MissingUpperBound : java.lang.Object { public constructor MissingUpperBound() - public open fun foo(): jet.String? where A : java.lang.Cloneable? + public open fun foo(): kotlin.String? where A : java.lang.Cloneable? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NoFieldTypeRef.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NoFieldTypeRef.txt index 68db0b3f758..b70ccd44e02 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NoFieldTypeRef.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NoFieldTypeRef.txt @@ -2,5 +2,5 @@ package test public open class NoFieldTypeRef : java.lang.Object { public constructor NoFieldTypeRef() - public final var foo: jet.String? + public final var foo: kotlin.String? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.txt index dd12dca0ab3..dd7d156b733 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.txt @@ -2,5 +2,5 @@ package test public open class NotVarargReplacedWithVararg : java.lang.Object { public constructor NotVarargReplacedWithVararg() - public open fun foo(/*0*/ p0: jet.String?): jet.Unit + public open fun foo(/*0*/ p0: kotlin.String?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.txt index 3ffb53ce086..7515df40be1 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.txt @@ -2,5 +2,5 @@ package test public open class RedundantProjectionKind : java.lang.Object { public constructor RedundantProjectionKind() - public open fun foo(/*0*/ p0: jet.List): jet.Unit + public open fun foo(/*0*/ p0: kotlin.List): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.java index 0725f82ee1b..acfb261ea2d 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.java @@ -4,7 +4,7 @@ import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; public class ReturnTypeMissing { - @ExpectLoadError("Return type in alternative signature is missing, while in real signature it is 'jet.Int'") + @ExpectLoadError("Return type in alternative signature is missing, while in real signature it is 'kotlin.Int'") @KotlinSignature("fun foo(a : String)") public int foo(String a) { throw new UnsupportedOperationException(); diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.txt index 758c1d04cc5..9d57aaf202f 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.txt @@ -2,5 +2,5 @@ package test public open class ReturnTypeMissing : java.lang.Object { public constructor ReturnTypeMissing() - public open fun foo(/*0*/ p0: jet.String?): jet.Int + public open fun foo(/*0*/ p0: kotlin.String?): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxError.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxError.txt index c3d9d75397d..b4538634edf 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxError.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxError.txt @@ -2,5 +2,5 @@ package test public open class SyntaxError : java.lang.Object { public constructor SyntaxError() - public open fun foo(): jet.Int? + public open fun foo(): kotlin.Int? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt index 4c428d0348f..98695658c8e 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt @@ -4,4 +4,4 @@ import java.util.* public open class SyntaxErrorInFieldAnnotation : Object() { public var foo : String? = "" -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt index 55fe5bd1e8d..c7d7df1339d 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt @@ -2,5 +2,5 @@ package test public open class SyntaxErrorInFieldAnnotation : java.lang.Object { public constructor SyntaxErrorInFieldAnnotation() - public final var foo: jet.String? + public final var foo: kotlin.String? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.txt index 7ae20ec2e62..2dd6078c77b 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.txt @@ -2,5 +2,5 @@ package test public open class VarargReplacedWithNotVararg : java.lang.Object { public constructor VarargReplacedWithNotVararg() - public open fun foo(/*0*/ vararg p0: jet.String? /*jet.Array*/): jet.Unit + public open fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array*/): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldInitializer.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldInitializer.txt index 3ecf94e21c2..1cb8d6974ad 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldInitializer.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldInitializer.txt @@ -2,5 +2,5 @@ package test public open class WrongFieldInitializer : java.lang.Object { public constructor WrongFieldInitializer() - public final var foo: jet.String? + public final var foo: kotlin.String? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldMutability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldMutability.txt index e259005d444..94c18385028 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldMutability.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldMutability.txt @@ -2,6 +2,6 @@ package test public open class WrongFieldMutability : java.lang.Object { public constructor WrongFieldMutability() - public final val fooFinal: jet.String? - public final var fooNotFinal: jet.String? + public final val fooFinal: kotlin.String? + public final var fooNotFinal: kotlin.String? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldName.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldName.txt index 13087f95fcf..a3bb940eb62 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldName.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldName.txt @@ -2,5 +2,5 @@ package test public open class WrongFieldName : java.lang.Object { public constructor WrongFieldName() - public final var foo: jet.String? + public final var foo: kotlin.String? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongMethodName.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongMethodName.txt index dccfa32a904..ab9df9bfabd 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongMethodName.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongMethodName.txt @@ -2,5 +2,5 @@ package test public open class WrongMethodName : java.lang.Object { public constructor WrongMethodName() - public open fun foo(): jet.String? + public open fun foo(): kotlin.String? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongProjectionKind.txt index 7c2fff98383..b2d801ac1a7 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongProjectionKind.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongProjectionKind.txt @@ -2,5 +2,5 @@ package test public open class WrongProjectionKind : java.lang.Object { public constructor WrongProjectionKind() - public open fun copy(/*0*/ p0: jet.Array?, /*1*/ p1: jet.Array?): jet.MutableList? + public open fun copy(/*0*/ p0: kotlin.Array?, /*1*/ p1: kotlin.Array?): kotlin.MutableList? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.java index 24bdd2adf25..d57417e63a1 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.java @@ -5,7 +5,7 @@ import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; public class WrongReturnTypeStructure { - @ExpectLoadError("'jet.String?' type in method signature has 0 type arguments, while 'String' in alternative signature has 1 of them") + @ExpectLoadError("'kotlin.String?' type in method signature has 0 type arguments, while 'String' in alternative signature has 1 of them") @KotlinSignature("fun foo(a : String, b : List?>) : String?") public String foo(String a, List> b) { throw new UnsupportedOperationException(); diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.txt index 39a1c48c70a..8798cb27fe7 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.txt @@ -2,5 +2,5 @@ package test public open class WrongReturnTypeStructure : java.lang.Object { public constructor WrongReturnTypeStructure() - public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List>?): jet.String? + public open fun foo(/*0*/ p0: kotlin.String?, /*1*/ p1: kotlin.List>?): kotlin.String? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.java index 801c873c50c..c9f4fe7a0e0 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.java @@ -5,7 +5,7 @@ import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; public class WrongTypeName1 { - @ExpectLoadError("Alternative signature type mismatch, expected: Unit, actual: jet.String") + @ExpectLoadError("Alternative signature type mismatch, expected: Unit, actual: kotlin.String") @KotlinSignature("fun foo(a : String) : Unit") public String foo(String a) { throw new UnsupportedOperationException(); diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.txt index b659ac6deda..75cc266d63c 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.txt @@ -2,5 +2,5 @@ package test public open class WrongTypeName1 : java.lang.Object { public constructor WrongTypeName1() - public open fun foo(/*0*/ p0: jet.String?): jet.String? + public open fun foo(/*0*/ p0: kotlin.String?): kotlin.String? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.java index b15eaf38ed3..23beec4842e 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.java @@ -5,7 +5,7 @@ import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; public class WrongTypeName2 { - @ExpectLoadError("Alternative signature type mismatch, expected: Something.String, actual: jet.String") + @ExpectLoadError("Alternative signature type mismatch, expected: Something.String, actual: kotlin.String") @KotlinSignature("fun foo(a : Something.String) : String") public String foo(String a) { throw new UnsupportedOperationException(); diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.txt index 187aec0322d..644ff1c99eb 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.txt @@ -2,5 +2,5 @@ package test public open class WrongTypeName2 : java.lang.Object { public constructor WrongTypeName2() - public open fun foo(/*0*/ p0: jet.String?): jet.String? + public open fun foo(/*0*/ p0: kotlin.String?): kotlin.String? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.java index ed711c221f7..74aac67f274 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.java @@ -5,7 +5,7 @@ import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; public class WrongTypeName3 { - @ExpectLoadError("Alternative signature type mismatch, expected: List, actual: jet.String") + @ExpectLoadError("Alternative signature type mismatch, expected: List, actual: kotlin.String") @KotlinSignature("fun foo(a : String) : List") public String foo(String a) { throw new UnsupportedOperationException(); diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.txt index 647b167bfd0..4b99bf9b5a5 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.txt @@ -2,5 +2,5 @@ package test public open class WrongTypeName3 : java.lang.Object { public constructor WrongTypeName3() - public open fun foo(/*0*/ p0: jet.String?): jet.String? + public open fun foo(/*0*/ p0: kotlin.String?): kotlin.String? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt index cc0332a65c2..ca8f645d57f 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt @@ -2,5 +2,5 @@ package test public open class WrongTypeParameterBoundStructure1 : java.lang.Object { public constructor WrongTypeParameterBoundStructure1() - public open fun foo(/*0*/ p0: A?, /*1*/ p1: jet.List?): jet.Unit where B : jet.List? + public open fun foo(/*0*/ p0: A?, /*1*/ p1: kotlin.List?): kotlin.Unit where B : kotlin.List? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.java index 54ff2850c6d..7d2e669b6d7 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.java @@ -6,7 +6,7 @@ import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; public class WrongTypeParameterBoundStructure2 { - @ExpectLoadError("'jet.List?' type in method signature has 1 type arguments, while 'List' in alternative signature has 0 of them") + @ExpectLoadError("'kotlin.List?' type in method signature has 1 type arguments, while 'List' in alternative signature has 0 of them") @KotlinSignature("fun foo(a : A, b : List) where B : List") public > void foo(A a, List b) { } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt index f432fad7b83..bf750f3a722 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt @@ -2,5 +2,5 @@ package test public open class WrongTypeParameterBoundStructure2 : java.lang.Object { public constructor WrongTypeParameterBoundStructure2() - public open fun foo(/*0*/ p0: A?, /*1*/ p1: jet.List?): jet.Unit where B : jet.List? + public open fun foo(/*0*/ p0: A?, /*1*/ p1: kotlin.List?): kotlin.Unit where B : kotlin.List? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.txt index 4adb64abeb7..7bde9a3b756 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.txt @@ -2,5 +2,5 @@ package test public open class WrongTypeParametersCount : java.lang.Object { public constructor WrongTypeParametersCount() - public open fun foo(/*0*/ p0: A?, /*1*/ p1: jet.List?): jet.Unit + public open fun foo(/*0*/ p0: A?, /*1*/ p1: kotlin.List?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.java index 7978adf6055..f71d8e9395b 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.java @@ -5,7 +5,7 @@ import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; public class WrongValueParameterStructure1 { - @ExpectLoadError("'jet.String?' type in method signature has 0 type arguments, while 'String' in alternative signature has 1 of them") + @ExpectLoadError("'kotlin.String?' type in method signature has 0 type arguments, while 'String' in alternative signature has 1 of them") @KotlinSignature("fun foo(a : String, b : List?>) : String") public String foo(String a, List> b) { throw new UnsupportedOperationException(); diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.txt index f4575319b12..b159f23788e 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.txt @@ -2,5 +2,5 @@ package test public open class WrongValueParameterStructure1 : java.lang.Object { public constructor WrongValueParameterStructure1() - public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List>?): jet.String? + public open fun foo(/*0*/ p0: kotlin.String?, /*1*/ p1: kotlin.List>?): kotlin.String? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.java index ea74515befe..60a94b29f26 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.java @@ -5,7 +5,7 @@ import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; public class WrongValueParameterStructure2 { - @ExpectLoadError("'jet.Map.Entry' type in method signature has 2 type arguments, while 'Map.Entry' in alternative signature has 1 of them") + @ExpectLoadError("'kotlin.Map.Entry' type in method signature has 2 type arguments, while 'Map.Entry' in alternative signature has 1 of them") @KotlinSignature("fun foo(a : String, b : List?>) : String") public String foo(String a, List> b) { throw new UnsupportedOperationException(); diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.txt index 21e8ee0fdb0..f6c77322373 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.txt @@ -2,5 +2,5 @@ package test public open class WrongValueParameterStructure2 : java.lang.Object { public constructor WrongValueParameterStructure2() - public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List>?): jet.String? + public open fun foo(/*0*/ p0: kotlin.String?, /*1*/ p1: kotlin.List>?): kotlin.String? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParametersCount.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParametersCount.txt index e13661e32c1..b1a68d615ea 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParametersCount.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParametersCount.txt @@ -2,5 +2,5 @@ package test public open class WrongValueParametersCount : java.lang.Object { public constructor WrongValueParametersCount() - public open fun foo(): jet.Int? + public open fun foo(): kotlin.Int? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt index 5386a0fe13f..45512238f7e 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt @@ -3,20 +3,20 @@ package test public trait PropagateTypeArgumentNullable : java.lang.Object { public trait Sub : test.PropagateTypeArgumentNullable.Super { - public abstract override /*1*/ fun invOutR(): jet.MutableList> - public abstract override /*1*/ fun invOutS(/*0*/ p0: jet.MutableList>): jet.Unit - public abstract override /*1*/ fun invR(): jet.MutableList - public abstract override /*1*/ fun outOutS(/*0*/ p0: jet.List>): jet.Unit - public abstract override /*1*/ fun outR(): jet.List - public abstract override /*1*/ fun outS(/*0*/ p0: jet.List): jet.Unit + public abstract override /*1*/ fun invOutR(): kotlin.MutableList> + public abstract override /*1*/ fun invOutS(/*0*/ p0: kotlin.MutableList>): kotlin.Unit + public abstract override /*1*/ fun invR(): kotlin.MutableList + public abstract override /*1*/ fun outOutS(/*0*/ p0: kotlin.List>): kotlin.Unit + public abstract override /*1*/ fun outR(): kotlin.List + public abstract override /*1*/ fun outS(/*0*/ p0: kotlin.List): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun invOutR(): jet.MutableList> - public abstract fun invOutS(/*0*/ p0: jet.MutableList>): jet.Unit - public abstract fun invR(): jet.MutableList - public abstract fun outOutS(/*0*/ p0: jet.List>): jet.Unit - public abstract fun outR(): jet.List - public abstract fun outS(/*0*/ p0: jet.List): jet.Unit + public abstract fun invOutR(): kotlin.MutableList> + public abstract fun invOutS(/*0*/ p0: kotlin.MutableList>): kotlin.Unit + public abstract fun invR(): kotlin.MutableList + public abstract fun outOutS(/*0*/ p0: kotlin.List>): kotlin.Unit + public abstract fun outR(): kotlin.List + public abstract fun outS(/*0*/ p0: kotlin.List): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java index 25d55fab532..219cda957be 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java @@ -19,4 +19,4 @@ public interface ChangeProjectionKind1 { @KotlinSignature("fun foo(p: MutableList)") void foo(List p); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt index ecb31a4b70f..7a2fd913a52 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt @@ -11,4 +11,4 @@ public trait ChangeProjectionKind1: Object { public trait Sub: Super { override fun foo(p0: MutableList) } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt index 409177b81c3..c0beec485a6 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt @@ -3,12 +3,12 @@ package test public trait ChangeProjectionKind1 : java.lang.Object { public trait Sub : test.ChangeProjectionKind1.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: jet.MutableList): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.MutableList): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: jet.MutableList): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.MutableList): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java index 8934798978d..bf028158090 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java @@ -19,4 +19,4 @@ public interface ChangeProjectionKind2 { @KotlinSignature("fun foo(p: MutableList)") void foo(List p); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt index d1eebda1e72..0b535f06738 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt @@ -11,4 +11,4 @@ public trait ChangeProjectionKind2: Object { public trait Sub: Super { override fun foo(p0: MutableList) } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt index abf17715354..72e40b7ec6c 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt @@ -3,12 +3,12 @@ package test public trait ChangeProjectionKind2 : java.lang.Object { public trait Sub : test.ChangeProjectionKind2.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: jet.MutableList): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.MutableList): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: jet.MutableList): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.MutableList): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.java index 64a61e894c9..6c7a9309f3f 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.java @@ -19,4 +19,4 @@ public interface DeeplySubstitutedClassParameter { public interface Sub extends Middle { void foo(String p); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt index b4ff55c26af..c28cd0d11a1 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt @@ -15,4 +15,4 @@ public trait DeeplySubstitutedClassParameter: Object { public trait Sub: Middle { override fun foo(p0: String) } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt index 1af26103fc0..500cecb6308 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt @@ -3,17 +3,17 @@ package test public trait DeeplySubstitutedClassParameter : java.lang.Object { public trait Middle : test.DeeplySubstitutedClassParameter.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: E): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: E): kotlin.Unit } - public trait Sub : test.DeeplySubstitutedClassParameter.Middle { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: jet.String): jet.Unit + public trait Sub : test.DeeplySubstitutedClassParameter.Middle { + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: T): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: T): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.java index 8ef8d2bfb42..21ceae88a08 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.java @@ -18,4 +18,4 @@ public interface DeeplySubstitutedClassParameter2 { public interface Sub extends Middle { void foo(String p); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt index dbbb780ac54..36d131717d7 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt @@ -14,4 +14,4 @@ public trait DeeplySubstitutedClassParameter2: Object { public trait Sub: Middle { override fun foo(p0: String) } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt index 2d0749b0255..0fb389359d7 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt @@ -3,17 +3,17 @@ package test public trait DeeplySubstitutedClassParameter2 : java.lang.Object { public trait Middle : test.DeeplySubstitutedClassParameter2.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: E): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: E): kotlin.Unit } - public trait Sub : test.DeeplySubstitutedClassParameter2.Middle { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: jet.String): jet.Unit + public trait Sub : test.DeeplySubstitutedClassParameter2.Middle { + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: T): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: T): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.txt index aeeaee31879..810d6296f4c 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.txt @@ -3,12 +3,12 @@ package test public trait InheritMutability : java.lang.Object { public trait Sub : test.InheritMutability.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: jet.MutableList): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.MutableList): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: jet.MutableList): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.MutableList): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.txt index 1ec42b198af..ba26295a7bc 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.txt @@ -3,12 +3,12 @@ package test public trait InheritNotVararg : java.lang.Object { public trait Sub : test.InheritNotVararg.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: jet.Array?): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array?): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: jet.Array?): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.Array?): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt index 3ee6e3dd5d2..349ef8e9d95 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt @@ -3,12 +3,12 @@ package test public trait InheritNotVarargInteger : java.lang.Object { public trait Sub : test.InheritNotVarargInteger.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: jet.Array?): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array?): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: jet.Array?): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.Array?): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt index 3ef95f3ab7d..d296b1e11c8 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt @@ -3,12 +3,12 @@ package test public trait InheritNotVarargNotNull : java.lang.Object { public trait Sub : test.InheritNotVarargNotNull.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: jet.Array): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: jet.Array): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.Array): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt index dc23978fb3a..7c87a6b5c0d 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt @@ -3,12 +3,12 @@ package test public trait InheritNotVarargPrimitive : java.lang.Object { public trait Sub : test.InheritNotVarargPrimitive.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: jet.IntArray?): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.IntArray?): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: jet.IntArray?): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.IntArray?): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.java index 85ae0a65db7..b6ef5facc1c 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.java @@ -13,4 +13,4 @@ public interface InheritNullability { public interface Sub extends Super { void foo(String p); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.kt index 8453a838ddd..9dc9f0d3703 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.kt @@ -11,4 +11,4 @@ public trait InheritNullability: Object { public trait Sub: Super { override fun foo(p0: String) } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.txt index 1db12796ce4..d9685a8a476 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.txt @@ -3,12 +3,12 @@ package test public trait InheritNullability : java.lang.Object { public trait Sub : test.InheritNullability.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: jet.String): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: jet.String): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.String): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.txt index 171c0f71273..9f680138d02 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.txt @@ -3,12 +3,12 @@ package test public trait InheritProjectionKind : java.lang.Object { public trait Sub : test.InheritProjectionKind.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: jet.MutableList): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.MutableList): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: jet.MutableList): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.MutableList): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.txt index 7175945fb0c..1f1f7feffb2 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.txt @@ -3,12 +3,12 @@ package test public trait InheritReadOnliness : java.lang.Object { public trait Sub : test.InheritReadOnliness.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: jet.List): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.List): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: jet.List): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.List): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.txt index 241f95b8823..8f0507e473a 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.txt @@ -3,12 +3,12 @@ package test public trait InheritVararg : java.lang.Object { public trait Sub : test.InheritVararg.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ vararg p0: jet.String? /*jet.Array*/): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array*/): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ vararg p0: jet.String? /*jet.Array*/): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array*/): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.txt index fd355069e40..2f9e5d55899 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.txt @@ -3,12 +3,12 @@ package test public trait InheritVarargInteger : java.lang.Object { public trait Sub : test.InheritVarargInteger.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ vararg p0: jet.Int? /*jet.Array*/): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int? /*kotlin.Array*/): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ vararg p0: jet.Int? /*jet.Array*/): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ vararg p0: kotlin.Int? /*kotlin.Array*/): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt index 3fe755c0fc6..8526ea453d8 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt @@ -3,12 +3,12 @@ package test public trait InheritVarargNotNull : java.lang.Object { public trait Sub : test.InheritVarargNotNull.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ vararg p0: jet.String /*jet.Array*/): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.String /*kotlin.Array*/): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ vararg p0: jet.String /*jet.Array*/): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ vararg p0: kotlin.String /*kotlin.Array*/): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt index b0cb5038c8b..33169113082 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt @@ -3,12 +3,12 @@ package test public trait InheritVarargPrimitive : java.lang.Object { public trait Sub : test.InheritVarargPrimitive.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ vararg p0: jet.Int /*jet.IntArray*/): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ vararg p0: jet.Int /*jet.IntArray*/): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ vararg p0: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/Kt3302.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/Kt3302.txt index adad1e38880..22406fa4182 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/Kt3302.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/Kt3302.txt @@ -3,17 +3,17 @@ package test public trait Kt3302 : java.lang.Object { public trait BSONObject : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun put(/*0*/ p0: jet.String, /*1*/ p1: jet.Any): jet.Any? + public abstract fun dummy(): kotlin.Unit + public abstract fun put(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.Any): kotlin.Any? } - public trait BasicBSONObject : test.Kt3302.LinkedHashMap, test.Kt3302.BSONObject { - public abstract override /*2*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*2*/ fun put(/*0*/ p0: jet.String, /*1*/ p1: jet.Any): jet.Any? + public trait BasicBSONObject : test.Kt3302.LinkedHashMap, test.Kt3302.BSONObject { + public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*2*/ fun put(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.Any): kotlin.Any? } public trait LinkedHashMap : java.lang.Object { - public abstract fun dummy(): jet.Unit + public abstract fun dummy(): kotlin.Unit public abstract fun put(/*0*/ p0: K, /*1*/ p1: V): V? } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.java index 0734fd54396..4a6a857e6d6 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.java @@ -19,4 +19,4 @@ public interface MutableToReadOnly { @KotlinSignature("fun foo(p: List)") void foo(List p); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.kt index e02528bcceb..60a1e73881e 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.kt @@ -11,4 +11,4 @@ public trait MutableToReadOnly: Object { public trait Sub: Super { override fun foo(p0: MutableList) } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.txt index ffd93f574ca..efed69d4d85 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.txt @@ -3,12 +3,12 @@ package test public trait MutableToReadOnly : java.lang.Object { public trait Sub : test.MutableToReadOnly.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: jet.MutableList): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.MutableList): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: jet.MutableList): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.MutableList): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.java index 2942e88ca90..6379df12ee0 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.java @@ -13,8 +13,8 @@ public interface NotNullToNullable { } public interface Sub extends Super { - @ExpectLoadError("Auto type 'jet.String' is not-null, while type in alternative signature is nullable: 'String?'") + @ExpectLoadError("Auto type 'kotlin.String' is not-null, while type in alternative signature is nullable: 'String?'") @KotlinSignature("fun foo(p: String?)") void foo(String p); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.kt index b71bfae63ec..9fb15ced7bb 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.kt @@ -11,4 +11,4 @@ public trait NotNullToNullable: Object { public trait Sub: Super { override fun foo(p0: String) } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.txt index 8c2af94ea6d..8fff3016832 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.txt @@ -3,12 +3,12 @@ package test public trait NotNullToNullable : java.lang.Object { public trait Sub : test.NotNullToNullable.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: jet.String): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: jet.String): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.String): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.java index 00838abdb08..83f9b823803 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.java @@ -16,4 +16,4 @@ public interface NullableToNotNull { @ExpectLoadError("In superclass type is nullable: [String?], in subclass it is not: String") void foo(@NotNull String p); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.kt index 9e0dfe5e09c..65dbc0234b8 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.kt @@ -11,4 +11,4 @@ public trait NullableToNotNull: Object { public trait Sub: Super { override fun foo(p0: String?) } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.txt index d4dd92fbd71..49a639cb1bd 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.txt @@ -3,12 +3,12 @@ package test public trait NullableToNotNull : java.lang.Object { public trait Sub : test.NullableToNotNull.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: jet.String?): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String?): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: jet.String?): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.String?): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java index 2622d91b6a9..f535389c4ce 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java @@ -18,4 +18,4 @@ public interface NullableToNotNullKotlinSignature { @KotlinSignature("fun foo(p: String)") void foo(String p); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt index 94dc13270d4..0b618765175 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt @@ -11,4 +11,4 @@ public trait NullableToNotNullKotlinSignature: Object { public trait Sub: Super { override fun foo(p0: String?) } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt index be636540d1f..f2dfe52b35f 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt @@ -3,12 +3,12 @@ package test public trait NullableToNotNullKotlinSignature : java.lang.Object { public trait Sub : test.NullableToNotNullKotlinSignature.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: jet.String?): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String?): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: jet.String?): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.String?): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.java index 431ef6a6fb7..f3cc8f9876c 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.java @@ -11,4 +11,4 @@ public interface OverrideWithErasedParameter { public interface Sub extends Super { void foo(Object o); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt index 9ee35b98934..20a80fac851 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt @@ -11,4 +11,4 @@ public trait OverrideWithErasedParameter: Object { public trait Sub: Super { override fun foo(p0: T?) } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt index 5f5a86d2f5e..5c8600f2917 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt @@ -3,12 +3,12 @@ package test public trait OverrideWithErasedParameter : java.lang.Object { public trait Sub : test.OverrideWithErasedParameter.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: T?): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: T?): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: T?): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: T?): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java index 46bc164d6b9..cce7a99801b 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java @@ -19,4 +19,4 @@ public interface ReadOnlyToMutable { @KotlinSignature("fun foo(p: MutableList)") void foo(List p); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt index 1bfebc1f983..3ba6304e4ea 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt @@ -11,4 +11,4 @@ public trait ReadOnlyToMutable: Object { public trait Sub: Super { override fun foo(p0: List) } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt index f67f4fcb26e..c94eb178188 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt @@ -3,12 +3,12 @@ package test public trait ReadOnlyToMutable : java.lang.Object { public trait Sub : test.ReadOnlyToMutable.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: jet.List): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.List): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: jet.List): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.List): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt index e2fa1a4b056..1415a46466f 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt @@ -3,17 +3,17 @@ package test public trait SubclassFromGenericAndNot : java.lang.Object { public trait Generic : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: T): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: T): kotlin.Unit } public trait NonGeneric : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: jet.String): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.String): kotlin.Unit } - public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic { - public abstract override /*2*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*2*/ fun foo(/*0*/ p0: jet.String): jet.Unit + public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic { + public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*2*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.java index 41014f12b63..1c69f905d0b 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.java @@ -15,4 +15,4 @@ public interface SubstitutedClassParameter { public interface Sub extends Super { void foo(String p); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt index acc91f47446..969c7bffc04 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt @@ -11,4 +11,4 @@ public trait SubstitutedClassParameter: Object { public trait Sub: Super { override fun foo(p0: String) } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt index 9519fb40516..944e3229ebc 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt @@ -2,13 +2,13 @@ package test public trait SubstitutedClassParameter : java.lang.Object { - public trait Sub : test.SubstitutedClassParameter.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: jet.String): jet.Unit + public trait Sub : test.SubstitutedClassParameter.Super { + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: T): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: T): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.java index 9cb496cff4a..467a59fc625 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.java @@ -22,4 +22,4 @@ public interface SubstitutedClassParameters { public interface Sub extends Super1, Super2 { void foo(String p); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt index 80ee6e9a6f6..6cafaf8dc83 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt @@ -17,4 +17,4 @@ public trait SubstitutedClassParameters: Object { public trait Sub: Super1, Super2 { override fun foo(p0: String) } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt index f7544cb7025..759f3e9996a 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt @@ -2,18 +2,18 @@ package test public trait SubstitutedClassParameters : java.lang.Object { - public trait Sub : test.SubstitutedClassParameters.Super1, test.SubstitutedClassParameters.Super2 { - public abstract override /*2*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*2*/ fun foo(/*0*/ p0: jet.String): jet.Unit + public trait Sub : test.SubstitutedClassParameters.Super1, test.SubstitutedClassParameters.Super2 { + public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*2*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit } public trait Super1 : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: T): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: T): kotlin.Unit } public trait Super2 : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(/*0*/ p0: E): jet.Unit + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(/*0*/ p0: E): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.java index d74fab64700..4a095ec0aae 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.java @@ -14,4 +14,4 @@ public interface AddNotNullJavaSubtype { @NotNull String foo(); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt index 67971addff9..6c15919808f 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt @@ -11,4 +11,4 @@ public trait AddNotNullJavaSubtype : Object { public trait Sub: Super { override fun foo(): String } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt index 12fc0189947..1f01b752f2b 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt @@ -3,12 +3,12 @@ package test public trait AddNotNullJavaSubtype : java.lang.Object { public trait Sub : test.AddNotNullJavaSubtype.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.String + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.String } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.CharSequence? + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.CharSequence? } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.java index 4a82eb85966..5768afc36ad 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.java @@ -14,4 +14,4 @@ public interface AddNotNullSameJavaType { @NotNull CharSequence foo(); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt index 6405352cc0b..bb4ffeac695 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt @@ -11,4 +11,4 @@ public trait AddNotNullSameJavaType: Object { public trait Sub: Super { override fun foo(): CharSequence } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt index bf0fd858e94..34bd6fef622 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt @@ -3,12 +3,12 @@ package test public trait AddNotNullSameJavaType : java.lang.Object { public trait Sub : test.AddNotNullSameJavaType.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.CharSequence + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.CharSequence } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.CharSequence? + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.CharSequence? } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java index 5ebe42ac84c..90e16237c12 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java @@ -14,8 +14,8 @@ public interface AddNullabilityJavaSubtype { } public interface Sub extends Super { - @ExpectLoadError("Auto type 'jet.String' is not-null, while type in alternative signature is nullable: 'String?'") + @ExpectLoadError("Auto type 'kotlin.String' is not-null, while type in alternative signature is nullable: 'String?'") @KotlinSignature("fun foo(): String?") String foo(); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt index 1286d5a002b..18223d10a85 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt @@ -11,4 +11,4 @@ public trait AddNullabilityJavaSubtype: Object { public trait Sub: Super { override fun foo(): String } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt index 9a21d66860b..de12604c349 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt @@ -3,12 +3,12 @@ package test public trait AddNullabilityJavaSubtype : java.lang.Object { public trait Sub : test.AddNullabilityJavaSubtype.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.String + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.String } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.CharSequence + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.CharSequence } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java index 29f65e09902..648a4740656 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java @@ -19,4 +19,4 @@ public interface AddNullabilitySameGenericType1 { @KotlinSignature("fun foo(): MutableList") List foo(); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt index d015d208ddf..9519d182e21 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt @@ -11,4 +11,4 @@ public trait AddNullabilitySameGenericType1: Object { public trait Sub: Super { override fun foo(): MutableList } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt index ca8b57d23ae..bf1f9c087de 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt @@ -3,12 +3,12 @@ package test public trait AddNullabilitySameGenericType1 : java.lang.Object { public trait Sub : test.AddNullabilitySameGenericType1.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.MutableList + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.MutableList } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.MutableList + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.MutableList } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java index 9c24c9b349d..6a141e9c428 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java @@ -15,8 +15,8 @@ public interface AddNullabilitySameGenericType2 { } public interface Sub extends Super { - @ExpectLoadError("Auto type 'jet.MutableList' is not-null, while type in alternative signature is nullable: 'MutableList?'") + @ExpectLoadError("Auto type 'kotlin.MutableList' is not-null, while type in alternative signature is nullable: 'MutableList?'") @KotlinSignature("fun foo(): MutableList?") List foo(); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt index e911c98f22a..9dc8cd26ef6 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt @@ -11,4 +11,4 @@ public trait AddNullabilitySameGenericType2: Object { public trait Sub: Super { override fun foo(): MutableList } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt index 675be3495a7..7d44d6fe9f5 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt @@ -3,12 +3,12 @@ package test public trait AddNullabilitySameGenericType2 : java.lang.Object { public trait Sub : test.AddNullabilitySameGenericType2.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.MutableList + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.MutableList } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.MutableList + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.MutableList } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java index 51e88cfcf5f..1c75f249a6c 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java @@ -15,8 +15,8 @@ public interface AddNullabilitySameJavaType { } public interface Sub extends Super { - @ExpectLoadError("Auto type 'jet.CharSequence' is not-null, while type in alternative signature is nullable: 'CharSequence?'") + @ExpectLoadError("Auto type 'kotlin.CharSequence' is not-null, while type in alternative signature is nullable: 'CharSequence?'") @KotlinSignature("fun foo(): CharSequence?") CharSequence foo(); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt index 48f6414f476..f4b350ef7a6 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt @@ -11,4 +11,4 @@ public trait AddNullabilitySameJavaType: Object { public trait Sub: Super { override fun foo(): CharSequence } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt index c7bdea6610d..810c81a5682 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt @@ -3,12 +3,12 @@ package test public trait AddNullabilitySameJavaType : java.lang.Object { public trait Sub : test.AddNullabilitySameJavaType.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.CharSequence + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.CharSequence } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.CharSequence + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.CharSequence } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt index 809026e3782..e4783606e09 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt @@ -3,12 +3,12 @@ package test public trait CantMakeImmutableInSubclass : java.lang.Object { public trait Sub : test.CantMakeImmutableInSubclass.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.MutableList + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.MutableList } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.MutableCollection + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.MutableCollection } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.java index 49eb91a88ad..4c96c4d0493 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.java @@ -21,4 +21,4 @@ public interface DeeplySubstitutedClassParameter { public interface Sub extends Middle { String foo(); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt index 69d15341ce3..ffa399eb9ba 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt @@ -15,4 +15,4 @@ public trait DeeplySubstitutedClassParameter: Object { public trait Sub: Middle { override fun foo(): String } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt index eaf34458cac..85da545e446 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt @@ -3,17 +3,17 @@ package test public trait DeeplySubstitutedClassParameter : java.lang.Object { public trait Middle : test.DeeplySubstitutedClassParameter.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit public abstract override /*1*/ fun foo(): E } - public trait Sub : test.DeeplySubstitutedClassParameter.Middle { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.String + public trait Sub : test.DeeplySubstitutedClassParameter.Middle { + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.String } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit + public abstract fun dummy(): kotlin.Unit public abstract fun foo(): T } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.java index 56aec8d0d6c..f5a27606b0c 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.java @@ -20,4 +20,4 @@ public interface DeeplySubstitutedClassParameter2 { public interface Sub extends Middle { String foo(); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt index 2ecd35992d5..0ecadadb87f 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt @@ -14,4 +14,4 @@ public trait DeeplySubstitutedClassParameter2: Object { public trait Sub: Middle { override fun foo(): String } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt index 0d30d560365..ef9b2d460d6 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt @@ -3,17 +3,17 @@ package test public trait DeeplySubstitutedClassParameter2 : java.lang.Object { public trait Middle : test.DeeplySubstitutedClassParameter2.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun foo(): E } - public trait Sub : test.DeeplySubstitutedClassParameter2.Middle { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.String + public trait Sub : test.DeeplySubstitutedClassParameter2.Middle { + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.String } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit + public abstract fun dummy(): kotlin.Unit public abstract fun foo(): T } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt index 3babae3c42a..c3dd3d3121c 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt @@ -3,36 +3,36 @@ package test public trait HalfSubstitutedTypeParameters : java.lang.Object { public trait Sub : test.HalfSubstitutedTypeParameters.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): test.HalfSubstitutedTypeParameters.TrickyList + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): test.HalfSubstitutedTypeParameters.TrickyList } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.MutableList + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.MutableList } - public trait TrickyList : jet.MutableList { - public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: jet.Int, /*1*/ element: E): jet.Unit - public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: jet.Collection): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: jet.Int, /*1*/ c: jet.Collection): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun clear(): jet.Unit - public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: jet.Collection): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: jet.Int): E - public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: jet.Any?): jet.Int - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun iterator(): jet.MutableIterator - public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: jet.Any?): jet.Int - public abstract override /*1*/ /*fake_override*/ fun listIterator(): jet.MutableListIterator - public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: jet.Int): jet.MutableListIterator - public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: jet.Any?): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ index: jet.Int): E - public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: jet.Collection): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: jet.Collection): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun set(/*0*/ index: jet.Int, /*1*/ element: E): E - public abstract override /*1*/ /*fake_override*/ fun size(): jet.Int - public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: jet.Int, /*1*/ toIndex: jet.Int): jet.MutableList + public trait TrickyList : kotlin.MutableList { + public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: E): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.Any?): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): E + public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int + public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator + public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int + public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator + public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator + public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ index: kotlin.Int): E + public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: E): E + public abstract override /*1*/ /*fake_override*/ fun size(): kotlin.Int + public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt index ca559b16199..d61130d1443 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt @@ -3,12 +3,12 @@ package test public trait InheritNullabilityGenericSubclassSimple : java.lang.Object { public trait Sub : test.InheritNullabilityGenericSubclassSimple.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.MutableList + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.MutableList } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.MutableCollection + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.MutableCollection } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.java index 0949c3d6e30..c300dc7de9d 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.java @@ -17,4 +17,4 @@ public interface InheritNullabilityJavaSubtype { public interface Sub extends Super { String foo(); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt index 370e5094ebd..a0fc1fca24c 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt @@ -11,4 +11,4 @@ public trait InheritNullabilityJavaSubtype: Object { public trait Sub: Super { override fun foo(): String } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt index dcf5b575e14..18ca93ce358 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt @@ -3,12 +3,12 @@ package test public trait InheritNullabilityJavaSubtype : java.lang.Object { public trait Sub : test.InheritNullabilityJavaSubtype.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.String + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.String } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.CharSequence + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.CharSequence } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.java index 98babac453c..5eaee409556 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.java @@ -17,4 +17,4 @@ public interface InheritNullabilitySameGenericType { public interface Sub extends Super { List foo(); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt index 0b4f9a94ba3..75f95088e64 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt @@ -11,4 +11,4 @@ public trait InheritNullabilitySameGenericType: Object { public trait Sub: Super { override fun foo(): MutableList } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt index d8be3e1a36a..3d6312fe166 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt @@ -3,12 +3,12 @@ package test public trait InheritNullabilitySameGenericType : java.lang.Object { public trait Sub : test.InheritNullabilitySameGenericType.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.MutableList + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.MutableList } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.MutableList + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.MutableList } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java index 3ec0e0316a3..cec7d32bc79 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java @@ -17,4 +17,4 @@ public interface InheritNullabilitySameJavaType { public interface Sub extends Super { CharSequence foo(); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt index 052832c29c0..6397518a1e9 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt @@ -11,4 +11,4 @@ public trait InheritNullabilitySameJavaType: Object { public trait Sub: Super { override fun foo(): CharSequence } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt index 374655677fb..d0c869928ff 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt @@ -3,12 +3,12 @@ package test public trait InheritNullabilitySameJavaType : java.lang.Object { public trait Sub : test.InheritNullabilitySameJavaType.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.CharSequence + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.CharSequence } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.CharSequence + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.CharSequence } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritProjectionKind.txt index d46d0e56efd..53342c72f76 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritProjectionKind.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritProjectionKind.txt @@ -3,12 +3,12 @@ package test public trait InheritProjectionKind : java.lang.Object { public trait Sub : test.InheritProjectionKind.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.MutableList + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.MutableList } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.MutableCollection + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.MutableCollection } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt index a695e38244b..71276c246f2 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt @@ -3,12 +3,12 @@ package test public trait InheritReadOnlinessOfArgument : java.lang.Object { public trait Sub : test.InheritReadOnlinessOfArgument.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.List> + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.List> } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.List> + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.List> } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt index 28864b8cc09..4307f37db27 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt @@ -3,12 +3,12 @@ package test public trait InheritReadOnlinessSameClass : java.lang.Object { public trait Sub : test.InheritReadOnlinessSameClass.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.List + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.List } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.List + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.List } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt index bd0a278f9c9..dfe072f6805 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt @@ -3,12 +3,12 @@ package test public trait InheritReadOnlinessSubclass : java.lang.Object { public trait Sub : test.InheritReadOnlinessSubclass.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.List + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.List } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.Collection + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.Collection } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SameProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SameProjectionKind.txt index 91761338031..fc08382acff 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SameProjectionKind.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SameProjectionKind.txt @@ -3,12 +3,12 @@ package test public trait SameProjectionKind : java.lang.Object { public trait Sub : test.SameProjectionKind.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.MutableCollection? + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.MutableCollection? } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.MutableCollection? + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.MutableCollection? } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt index 7890b05e157..e4ba02eaa82 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt @@ -3,17 +3,17 @@ package test public trait SubclassFromGenericAndNot : java.lang.Object { public trait Generic : java.lang.Object { - public abstract fun dummy(): jet.Unit + public abstract fun dummy(): kotlin.Unit public abstract fun foo(): T } public trait NonGeneric : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.String? + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.String? } - public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic { - public abstract override /*2*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*2*/ fun foo(): jet.String + public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic { + public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*2*/ fun foo(): kotlin.String } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfCollection.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfCollection.txt index 9c010de8d80..b91eba675d8 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfCollection.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfCollection.txt @@ -1,15 +1,15 @@ package test -public trait SubclassOfCollection : jet.MutableCollection { - public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: jet.Collection): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun clear(): jet.Unit - public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: jet.Collection): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): jet.Boolean - public abstract override /*1*/ fun iterator(): jet.MutableIterator - public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: jet.Any?): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: jet.Collection): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: jet.Collection): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun size(): jet.Int +public trait SubclassOfCollection : kotlin.MutableCollection { + public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.Any?): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean + public abstract override /*1*/ fun iterator(): kotlin.MutableIterator + public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun size(): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfMapEntry.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfMapEntry.txt index 2950f06146d..7665a9898b6 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfMapEntry.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfMapEntry.txt @@ -1,6 +1,6 @@ package test -public trait SubclassOfMapEntry : jet.MutableMap.MutableEntry { +public trait SubclassOfMapEntry : kotlin.MutableMap.MutableEntry { public abstract override /*1*/ /*fake_override*/ fun getKey(): K public abstract override /*1*/ /*fake_override*/ fun getValue(): V public abstract override /*1*/ fun setValue(/*0*/ p0: V): V diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.java index 9cf4c6ed254..3ba79d48d62 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.java @@ -17,4 +17,4 @@ public interface SubstitutedClassParameter { public interface Sub extends Super { String foo(); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.kt index 201674695cd..7a3a30324f3 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.kt @@ -11,4 +11,4 @@ public trait SubstitutedClassParameter: Object { public trait Sub: Super { override fun foo(): String } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.txt index ab6bb6ea4dc..952b276dcfe 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.txt @@ -2,13 +2,13 @@ package test public trait SubstitutedClassParameter : java.lang.Object { - public trait Sub : test.SubstitutedClassParameter.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.String + public trait Sub : test.SubstitutedClassParameter.Super { + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.String } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit + public abstract fun dummy(): kotlin.Unit public abstract fun foo(): T } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.java index 3d9ddb9a084..4ac1d725a13 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.java @@ -24,4 +24,4 @@ public interface SubstitutedClassParameters { public interface Sub extends Super1, Super2 { String foo(); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.kt index 5cc9877664a..4f24276cc40 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.kt @@ -17,4 +17,4 @@ public trait SubstitutedClassParameters: Object { public trait Sub: Super1, Super2 { override fun foo(): String } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.txt index 63c5cbb7d92..446f124757c 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.txt @@ -2,18 +2,18 @@ package test public trait SubstitutedClassParameters : java.lang.Object { - public trait Sub : test.SubstitutedClassParameters.Super1, test.SubstitutedClassParameters.Super2 { - public abstract override /*2*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*2*/ fun foo(): jet.String + public trait Sub : test.SubstitutedClassParameters.Super1, test.SubstitutedClassParameters.Super2 { + public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*2*/ fun foo(): kotlin.String } public trait Super1 : java.lang.Object { - public abstract fun dummy(): jet.Unit + public abstract fun dummy(): kotlin.Unit public abstract fun foo(): T } public trait Super2 : java.lang.Object { - public abstract fun dummy(): jet.Unit + public abstract fun dummy(): kotlin.Unit public abstract fun foo(): E } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt index 262458c8042..f01fe9bb6f7 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt @@ -3,17 +3,17 @@ package test public trait TwoSuperclassesConflictingProjectionKinds : java.lang.Object { public trait Sub : test.TwoSuperclassesConflictingProjectionKinds.Super1, test.TwoSuperclassesConflictingProjectionKinds.Super2 { - public abstract override /*2*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*2*/ fun foo(): jet.MutableCollection + public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*2*/ fun foo(): kotlin.MutableCollection } public trait Super1 : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.MutableCollection + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.MutableCollection } public trait Super2 : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.MutableCollection + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.MutableCollection } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt index 31629bfd936..0f23605bf04 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt @@ -3,17 +3,17 @@ package test public trait TwoSuperclassesInvariantAndCovariantInferMutability : java.lang.Object { public trait Sub : test.TwoSuperclassesInvariantAndCovariantInferMutability.Super1, test.TwoSuperclassesInvariantAndCovariantInferMutability.Super2 { - public abstract override /*2*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*2*/ fun foo(): jet.MutableList> + public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*2*/ fun foo(): kotlin.MutableList> } public trait Super1 : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.List> + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.List> } public trait Super2 : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.MutableList> + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.MutableList> } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt index 272832c7813..b6c4c1f2cad 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt @@ -3,17 +3,17 @@ package test public trait TwoSuperclassesInvariantAndCovariantInferNullability : java.lang.Object { public trait Sub : test.TwoSuperclassesInvariantAndCovariantInferNullability.Super1, test.TwoSuperclassesInvariantAndCovariantInferNullability.Super2 { - public abstract override /*2*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*2*/ fun foo(): jet.MutableList + public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*2*/ fun foo(): kotlin.MutableList } public trait Super1 : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.List + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.List } public trait Super2 : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.MutableList + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.MutableList } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt index b38bc33624e..1eb02c8dc14 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt @@ -3,17 +3,17 @@ package test public trait TwoSuperclassesMutableAndNot : java.lang.Object { public trait Sub : test.TwoSuperclassesMutableAndNot.Super1, test.TwoSuperclassesMutableAndNot.Super2 { - public abstract override /*2*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*2*/ fun foo(): jet.MutableList + public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*2*/ fun foo(): kotlin.MutableList } public trait Super1 : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.MutableCollection + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.MutableCollection } public trait Super2 : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.List + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.List } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.java index cc132658d4f..37cf50673a8 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.java @@ -21,4 +21,4 @@ public interface TwoSuperclassesReturnJavaSubtype { public interface Sub extends Super1, Super2 { public String foo(); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt index bdd97baa335..d9ee0bdeda0 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt @@ -17,4 +17,4 @@ public trait TwoSuperclassesReturnJavaSubtype: Object { public trait Sub: Super1, Super2 { override fun foo(): String } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt index 87189d41f8b..1fb3f31d222 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt @@ -3,17 +3,17 @@ package test public trait TwoSuperclassesReturnJavaSubtype : java.lang.Object { public trait Sub : test.TwoSuperclassesReturnJavaSubtype.Super1, test.TwoSuperclassesReturnJavaSubtype.Super2 { - public abstract override /*2*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*2*/ fun foo(): jet.String + public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*2*/ fun foo(): kotlin.String } public trait Super1 : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.CharSequence? + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.CharSequence? } public trait Super2 : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.CharSequence + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.CharSequence } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.java index 26579c01765..3050eca20b9 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.java @@ -21,4 +21,4 @@ public interface TwoSuperclassesReturnSameJavaType { public interface Sub extends Super1, Super2 { public CharSequence foo(); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt index 77c3c72fc5e..077208f048d 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt @@ -17,4 +17,4 @@ public trait TwoSuperclassesReturnSameJavaType: Object { public trait Sub: Super1, Super2 { override fun foo(): CharSequence } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt index 3cd06918bae..b2eaccccda0 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt @@ -3,17 +3,17 @@ package test public trait TwoSuperclassesReturnSameJavaType : java.lang.Object { public trait Sub : test.TwoSuperclassesReturnSameJavaType.Super1, test.TwoSuperclassesReturnSameJavaType.Super2 { - public abstract override /*2*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*2*/ fun foo(): jet.CharSequence + public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*2*/ fun foo(): kotlin.CharSequence } public trait Super1 : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.CharSequence? + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.CharSequence? } public trait Super2 : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.CharSequence + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.CharSequence } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.java b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.java index 1a92be2f488..8078d1da368 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.java +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.java @@ -3,7 +3,7 @@ package test; import org.jetbrains.annotations.NotNull; import jet.runtime.typeinfo.KotlinSignature; import java.util.*; -import jet.*; +import kotlin.*; public interface TwoSuperclassesSupplementNotNull { diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt index bf4c145c668..9c829a8e9b8 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt @@ -3,17 +3,17 @@ package test public trait TwoSuperclassesSupplementNotNull : java.lang.Object { public trait Sub : test.TwoSuperclassesSupplementNotNull.Super1, test.TwoSuperclassesSupplementNotNull.Super2 { - public abstract override /*2*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*2*/ fun foo(): jet.List + public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*2*/ fun foo(): kotlin.List } public trait Super1 : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.List + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.List } public trait Super2 : java.lang.Object { - public abstract fun dummy(): jet.Unit - public abstract fun foo(): jet.List? + public abstract fun dummy(): kotlin.Unit + public abstract fun foo(): kotlin.List? } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClass.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClass.txt index 416a9acf4c0..3e0ec23b8e5 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClass.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClass.txt @@ -3,12 +3,12 @@ package test public trait TypeParamOfClass : java.lang.Object { public trait Sub : test.TypeParamOfClass.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit public abstract override /*1*/ fun foo(): T } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit + public abstract fun dummy(): kotlin.Unit public abstract fun foo(): T } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt index 559a1015e3c..4366e87a237 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt @@ -2,13 +2,13 @@ package test public trait TypeParamOfClassSubstituted : java.lang.Object { - public trait Sub : test.TypeParamOfClassSubstituted.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit - public abstract override /*1*/ fun foo(): jet.String + public trait Sub : test.TypeParamOfClassSubstituted.Super { + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit + public abstract override /*1*/ fun foo(): kotlin.String } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit + public abstract fun dummy(): kotlin.Unit public abstract fun foo(): T } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfFun.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfFun.txt index 6d718752f40..d6f55664a65 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfFun.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfFun.txt @@ -3,12 +3,12 @@ package test public trait TypeParamOfFun : java.lang.Object { public trait Sub : test.TypeParamOfFun.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): jet.Unit + public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit public abstract override /*1*/ fun foo(): E } public trait Super : java.lang.Object { - public abstract fun dummy(): jet.Unit + public abstract fun dummy(): kotlin.Unit public abstract fun foo(): T } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.txt index 3224089ed40..29177548f0f 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.txt @@ -3,10 +3,10 @@ package test public trait InheritMutability : java.lang.Object { public trait Sub : test.InheritMutability.Super { - public abstract override /*1*/ fun > foo(/*0*/ p0: B): jet.Unit + public abstract override /*1*/ fun > foo(/*0*/ p0: B): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun > foo(/*0*/ p0: A): jet.Unit + public abstract fun > foo(/*0*/ p0: A): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.txt index e12b537cec3..943df1e7384 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.txt @@ -3,10 +3,10 @@ package test public trait InheritNullability : java.lang.Object { public trait Sub : test.InheritNullability.Super { - public abstract override /*1*/ fun foo(/*0*/ p0: B): jet.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: B): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun foo(/*0*/ p0: A): jet.Unit + public abstract fun foo(/*0*/ p0: A): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt index 038fabf8433..821c6cc0fc5 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt @@ -3,10 +3,10 @@ package test public trait InheritReadOnliness : java.lang.Object { public trait Sub : test.InheritReadOnliness.Super { - public abstract override /*1*/ fun > foo(/*0*/ p0: B): jet.Unit + public abstract override /*1*/ fun > foo(/*0*/ p0: B): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun > foo(/*0*/ p0: A): jet.Unit + public abstract fun > foo(/*0*/ p0: A): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.txt index ee8b7141122..f552703bae5 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.txt @@ -3,10 +3,10 @@ package test public trait TwoBounds : java.lang.Object { public trait Sub : test.TwoBounds.Super { - public abstract override /*1*/ fun foo(/*0*/ p0: B): jet.Unit where B : java.lang.Cloneable + public abstract override /*1*/ fun foo(/*0*/ p0: B): kotlin.Unit where B : java.lang.Cloneable } public trait Super : java.lang.Object { - public abstract fun foo(/*0*/ p0: A): jet.Unit where A : java.lang.Cloneable + public abstract fun foo(/*0*/ p0: A): kotlin.Unit where A : java.lang.Cloneable } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt index bd62c2b83d1..fbfe8556170 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt @@ -3,14 +3,14 @@ package test public trait TwoSuperclasses : java.lang.Object { public trait Sub : test.TwoSuperclasses.Super1, test.TwoSuperclasses.Super2 { - public abstract override /*2*/ fun foo(/*0*/ p0: C): jet.Unit + public abstract override /*2*/ fun foo(/*0*/ p0: C): kotlin.Unit } public trait Super1 : java.lang.Object { - public abstract fun foo(/*0*/ p0: A): jet.Unit + public abstract fun foo(/*0*/ p0: A): kotlin.Unit } public trait Super2 : java.lang.Object { - public abstract fun foo(/*0*/ p0: B): jet.Unit + public abstract fun foo(/*0*/ p0: B): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt index 56976314e93..81f839fd45f 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt @@ -3,10 +3,10 @@ package test public trait TwoTypeParameters : java.lang.Object { public trait Sub : test.TwoTypeParameters.Super { - public abstract override /*1*/ fun foo(/*0*/ p0: B, /*1*/ p1: A): jet.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: B, /*1*/ p1: A): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun foo(/*0*/ p0: A, /*1*/ p1: B): jet.Unit + public abstract fun foo(/*0*/ p0: A, /*1*/ p1: B): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt index cedadaba58c..145abe62b88 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt @@ -3,10 +3,10 @@ package test public trait UseParameterAsUpperBound : java.lang.Object { public trait Sub : test.UseParameterAsUpperBound.Super { - public abstract override /*1*/ fun foo(/*0*/ p0: B, /*1*/ p1: A): jet.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: B, /*1*/ p1: A): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun foo(/*0*/ p0: A, /*1*/ p1: B): jet.Unit + public abstract fun foo(/*0*/ p0: A, /*1*/ p1: B): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt index 7b40733bb71..ec63b21f330 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt @@ -3,10 +3,10 @@ package test public trait UseParameterInUpperBound : java.lang.Object { public trait Sub : test.UseParameterInUpperBound.Super { - public abstract override /*1*/ fun > foo(/*0*/ p0: B, /*1*/ p1: A): jet.Unit + public abstract override /*1*/ fun > foo(/*0*/ p0: B, /*1*/ p1: A): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun > foo(/*0*/ p0: A, /*1*/ p1: B): jet.Unit + public abstract fun > foo(/*0*/ p0: A, /*1*/ p1: B): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt index 12497f680bf..57bded1fb5c 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt @@ -3,10 +3,10 @@ package test public trait UseParameterInUpperBoundWithKotlinSignature : java.lang.Object { public trait Sub : test.UseParameterInUpperBoundWithKotlinSignature.Super { - public abstract override /*1*/ fun > foo(/*0*/ p0: B, /*1*/ p1: A): jet.Unit + public abstract override /*1*/ fun > foo(/*0*/ p0: B, /*1*/ p1: A): kotlin.Unit } public trait Super : java.lang.Object { - public abstract fun > foo(/*0*/ p0: A, /*1*/ p1: B): jet.Unit + public abstract fun > foo(/*0*/ p0: A, /*1*/ p1: B): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.txt index c031b459957..6482f29ef79 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.txt @@ -1,6 +1,6 @@ package test public trait LoadIterable : java.lang.Object { - public abstract fun getIterable(): jet.MutableIterable? - public abstract fun setIterable(/*0*/ p0: jet.Iterable?): jet.Unit + public abstract fun getIterable(): kotlin.MutableIterable? + public abstract fun setIterable(/*0*/ p0: kotlin.Iterable?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.txt index bc156b06126..1e867a8e3fc 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.txt @@ -1,6 +1,6 @@ package test public trait LoadIterator : java.lang.Object { - public abstract fun getIterator(): jet.MutableIterator? - public abstract fun setIterator(/*0*/ p0: jet.Iterator?): jet.Unit + public abstract fun getIterator(): kotlin.MutableIterator? + public abstract fun setIterator(/*0*/ p0: kotlin.Iterator?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/Max.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/Max.txt index 245709a918f..13ed15d6430 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/Max.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/Max.txt @@ -2,5 +2,5 @@ package test public open class Max : java.lang.Object { public constructor Max() - public open fun max(/*0*/ p0: jet.Collection?): T? where T : jet.Comparable? + public open fun max(/*0*/ p0: kotlin.Collection?): T? where T : kotlin.Comparable? } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality/ModalityOfFakeOverrides.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality/ModalityOfFakeOverrides.txt index 0015e593846..e25e50d2628 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality/ModalityOfFakeOverrides.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality/ModalityOfFakeOverrides.txt @@ -1,30 +1,30 @@ package test -public open class ModalityOfFakeOverrides : java.util.AbstractList { +public open class ModalityOfFakeOverrides : java.util.AbstractList { public constructor ModalityOfFakeOverrides() - protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: jet.Int - public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0: jet.Int, /*1*/ p1: jet.String): jet.Unit - public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0: jet.String): jet.Boolean - public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: jet.Collection): jet.Boolean - public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ p0: jet.Int, /*1*/ p1: jet.Collection): jet.Boolean - public open override /*1*/ /*fake_override*/ fun clear(): jet.Unit - public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean - public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: jet.Collection): jet.Boolean - public open override /*1*/ fun get(/*0*/ p0: jet.Int): jet.String - public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ p0: jet.Any?): jet.Int - public open override /*1*/ /*fake_override*/ fun isEmpty(): jet.Boolean - public open override /*1*/ /*fake_override*/ fun iterator(): jet.MutableIterator - public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ p0: jet.Any?): jet.Int - public open override /*1*/ /*fake_override*/ fun listIterator(): jet.MutableListIterator - public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ p0: jet.Int): jet.MutableListIterator - public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: jet.Any?): jet.Boolean - public open override /*1*/ /*fake_override*/ fun remove(/*0*/ p0: jet.Int): jet.String - public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: jet.Collection): jet.Boolean - protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): jet.Unit - public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: jet.Collection): jet.Boolean - public open override /*1*/ /*fake_override*/ fun set(/*0*/ p0: jet.Int, /*1*/ p1: jet.String): jet.String - public open override /*1*/ fun size(): jet.Int - public open override /*1*/ /*fake_override*/ fun subList(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): jet.MutableList - public open override /*1*/ /*fake_override*/ fun toArray(): jet.Array - public open override /*1*/ /*fake_override*/ fun toArray(/*0*/ p0: jet.Array): jet.Array + protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int + public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.String): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0: kotlin.String): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Collection): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.Any?): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean + public open override /*1*/ fun get(/*0*/ p0: kotlin.Int): kotlin.String + public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ p0: kotlin.Any?): kotlin.Int + public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator + public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ p0: kotlin.Any?): kotlin.Int + public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator + public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ p0: kotlin.Int): kotlin.MutableListIterator + public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun remove(/*0*/ p0: kotlin.Int): kotlin.String + public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection): kotlin.Boolean + protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun set(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.String): kotlin.String + public open override /*1*/ fun size(): kotlin.Int + public open override /*1*/ /*fake_override*/ fun subList(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.MutableList + public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array + public open override /*1*/ /*fake_override*/ fun toArray(/*0*/ p0: kotlin.Array): kotlin.Array } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterable.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterable.txt index 3c2780a0948..97656f57415 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterable.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterable.txt @@ -1,8 +1,8 @@ package test public trait LoadIterable : java.lang.Object { - org.jetbrains.annotations.Mutable() public abstract fun getIterable(): jet.MutableIterable? - org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): jet.Iterable? - public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: jet.MutableIterable?): jet.Unit - public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: jet.Iterable?): jet.Unit + org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable? + org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable? + public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable?): kotlin.Unit + public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.Iterable?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithConflict.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithConflict.txt index be5cfed70da..52e5b2fc675 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithConflict.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithConflict.txt @@ -1,6 +1,6 @@ package test public trait LoadIterableWithConflict : java.lang.Object { - org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() public abstract fun getIterable(): jet.MutableIterable? - public abstract fun setIterable(/*0*/ org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() p0: jet.MutableIterable?): jet.Unit + org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable? + public abstract fun setIterable(/*0*/ org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithNullability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithNullability.txt index a5d7dec8a19..5a773c964d2 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithNullability.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithNullability.txt @@ -1,8 +1,8 @@ package test public trait LoadIterableWithNullability : java.lang.Object { - org.jetbrains.annotations.Mutable() public abstract fun getIterable(): jet.MutableIterable - org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): jet.Iterable - public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: jet.MutableIterable): jet.Unit - public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: jet.Iterable): jet.Unit + org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable + org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable + public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable): kotlin.Unit + public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.Iterable): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithPropagation.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithPropagation.txt index d835f62fc3f..d6e344792b4 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithPropagation.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithPropagation.txt @@ -3,17 +3,17 @@ package test public trait LoadIterableWithPropagation : java.lang.Object { public trait LoadIterable : java.lang.Object { - org.jetbrains.annotations.Mutable() public abstract fun getIterable(): jet.MutableIterable? - org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): jet.Iterable? - public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: jet.MutableIterable?): jet.Unit - public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: jet.Iterable?): jet.Unit + org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable? + org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable? + public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable?): kotlin.Unit + public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.Iterable?): kotlin.Unit } public open class LoadIterableImpl : test.LoadIterableWithPropagation.LoadIterable { public constructor LoadIterableImpl() - public open override /*1*/ fun getIterable(): jet.MutableIterable? - public open override /*1*/ fun getReadOnlyIterable(): jet.Iterable? - public open override /*1*/ fun setIterable(/*0*/ p0: jet.MutableIterable?): jet.Unit - public open override /*1*/ fun setReadOnlyIterable(/*0*/ p0: jet.Iterable?): jet.Unit + public open override /*1*/ fun getIterable(): kotlin.MutableIterable? + public open override /*1*/ fun getReadOnlyIterable(): kotlin.Iterable? + public open override /*1*/ fun setIterable(/*0*/ p0: kotlin.MutableIterable?): kotlin.Unit + public open override /*1*/ fun setReadOnlyIterable(/*0*/ p0: kotlin.Iterable?): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullField.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullField.txt index 94a7fab3ff6..cdc5dbfc549 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullField.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullField.txt @@ -2,5 +2,5 @@ package test public open class NotNullField : java.lang.Object { public constructor NotNullField() - public final var hi: jet.String + public final var hi: kotlin.String } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullIntArray.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullIntArray.txt index f45b01ca009..4930124c06a 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullIntArray.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullIntArray.txt @@ -2,5 +2,5 @@ package test public open class NotNullIntArray : java.lang.Object { public constructor NotNullIntArray() - public open fun hi(): jet.IntArray + public open fun hi(): kotlin.IntArray } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullMethod.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullMethod.txt index b015abcf482..f42717697f0 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullMethod.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullMethod.txt @@ -2,5 +2,5 @@ package test public open class NotNullMethod : java.lang.Object { public constructor NotNullMethod() - public open fun hi(): jet.String + public open fun hi(): kotlin.String } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullObjectArray.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullObjectArray.txt index e39922cf919..33d97acf9d5 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullObjectArray.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullObjectArray.txt @@ -2,5 +2,5 @@ package test public open class NotNullObjectArray : java.lang.Object { public constructor NotNullObjectArray() - public open fun hi(): jet.Array + public open fun hi(): kotlin.Array } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.txt index b8256d4404a..d11d4fe0157 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.txt @@ -2,5 +2,5 @@ package test public open class NotNullParameter : java.lang.Object { public constructor NotNullParameter() - public open fun hi(/*0*/ p0: jet.String): jet.Unit + public open fun hi(/*0*/ p0: kotlin.String): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.txt index dff015b16ae..611ba5e4f33 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.txt @@ -2,5 +2,5 @@ package test public open class VarargInt : java.lang.Object { public constructor VarargInt() - public open fun vararg(/*0*/ vararg p0: jet.Int /*jet.IntArray*/): jet.Unit + public open fun vararg(/*0*/ vararg p0: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.txt index a003720a45b..a529b8e99f0 100644 --- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.txt +++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.txt @@ -2,5 +2,5 @@ package test public open class VarargString : java.lang.Object { public constructor VarargString() - public open fun vararg(/*0*/ vararg p0: jet.String? /*jet.Array*/): jet.Unit + public open fun vararg(/*0*/ vararg p0: kotlin.String? /*kotlin.Array*/): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaIncludeObjectMethods/ClassWithObjectMethod.txt b/compiler/testData/loadJava/compiledJavaIncludeObjectMethods/ClassWithObjectMethod.txt index 35ef35ce452..a01c815e27e 100644 --- a/compiler/testData/loadJava/compiledJavaIncludeObjectMethods/ClassWithObjectMethod.txt +++ b/compiler/testData/loadJava/compiledJavaIncludeObjectMethods/ClassWithObjectMethod.txt @@ -2,15 +2,15 @@ package test public final class ClassWithObjectMethod : java.lang.Object { public constructor ClassWithObjectMethod() - protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun clone(): jet.Any - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean - protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun finalize(): jet.Unit - public final override /*1*/ /*fake_override*/ fun getClass(): java.lang.Class - public open override /*1*/ /*fake_override*/ fun hashCode(): jet.Int - public final override /*1*/ /*fake_override*/ fun notify(): jet.Unit - public final override /*1*/ /*fake_override*/ fun notifyAll(): jet.Unit - public open override /*1*/ fun toString(): jet.String? - public final override /*1*/ /*fake_override*/ fun wait(): jet.Unit - public final override /*1*/ /*fake_override*/ fun wait(/*0*/ p0: jet.Long): jet.Unit - public final override /*1*/ /*fake_override*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Unit + protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ fun getClass(): java.lang.Class + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public final override /*1*/ /*fake_override*/ fun notify(): kotlin.Unit + public final override /*1*/ /*fake_override*/ fun notifyAll(): kotlin.Unit + public open override /*1*/ fun toString(): kotlin.String? + public final override /*1*/ /*fake_override*/ fun wait(): kotlin.Unit + public final override /*1*/ /*fake_override*/ fun wait(/*0*/ p0: kotlin.Long): kotlin.Unit + public final override /*1*/ /*fake_override*/ fun wait(/*0*/ p0: kotlin.Long, /*1*/ p1: kotlin.Int): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJavaIncludeObjectMethods/InterfaceWithObjectMethods.txt b/compiler/testData/loadJava/compiledJavaIncludeObjectMethods/InterfaceWithObjectMethods.txt index 816c8141c73..73b2a66c44d 100644 --- a/compiler/testData/loadJava/compiledJavaIncludeObjectMethods/InterfaceWithObjectMethods.txt +++ b/compiler/testData/loadJava/compiledJavaIncludeObjectMethods/InterfaceWithObjectMethods.txt @@ -1,15 +1,15 @@ package test public trait InterfaceWithObjectMethods : java.lang.Object { - public abstract override /*1*/ fun clone(): jet.Any? - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean - public abstract override /*1*/ fun finalize(): jet.Unit - public final override /*1*/ /*fake_override*/ fun getClass(): java.lang.Class - public open override /*1*/ /*fake_override*/ fun hashCode(): jet.Int - public final override /*1*/ /*fake_override*/ fun notify(): jet.Unit - public final override /*1*/ /*fake_override*/ fun notifyAll(): jet.Unit - public open override /*1*/ /*fake_override*/ fun toString(): jet.String? - public final override /*1*/ /*fake_override*/ fun wait(): jet.Unit - public final override /*1*/ /*fake_override*/ fun wait(/*0*/ p0: jet.Long): jet.Unit - public final override /*1*/ /*fake_override*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Unit + public abstract override /*1*/ fun clone(): kotlin.Any? + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public abstract override /*1*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ fun getClass(): java.lang.Class + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public final override /*1*/ /*fake_override*/ fun notify(): kotlin.Unit + public final override /*1*/ /*fake_override*/ fun notifyAll(): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String? + public final override /*1*/ /*fake_override*/ fun wait(): kotlin.Unit + public final override /*1*/ /*fake_override*/ fun wait(/*0*/ p0: kotlin.Long): kotlin.Unit + public final override /*1*/ /*fake_override*/ fun wait(/*0*/ p0: kotlin.Long, /*1*/ p1: kotlin.Int): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt index f621366a247..d790c4d8d39 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt @@ -1,6 +1,6 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } @@ -9,8 +9,8 @@ internal final class Class { internal class object { /*primary*/ private constructor () - test.Anno() internal final var property: jet.Int - internal final fun (): jet.Int - internal final fun (/*0*/ : jet.Int): jet.Unit + test.Anno() internal final var property: kotlin.Int + internal final fun (): kotlin.Int + internal final fun (/*0*/ : kotlin.Int): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.txt index ca73fd23824..d269b2347a0 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.txt @@ -1,11 +1,11 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } internal final class Class { /*primary*/ public constructor Class() - test.Anno() internal final val x: jet.Int - internal final fun (): jet.Int + test.Anno() internal final val x: kotlin.Int + internal final fun (): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.txt index a9e75cb0512..118eab1b02b 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.txt @@ -1,13 +1,13 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno(/*0*/ t: java.lang.annotation.ElementType) } internal final class Class { /*primary*/ public constructor Class() - test.Anno(t = ElementType.FIELD: java.lang.annotation.ElementType) internal final var bar: jet.Int - internal final fun (): jet.Int - internal final fun (/*0*/ : jet.Int): jet.Unit - test.Anno(t = ElementType.METHOD: java.lang.annotation.ElementType) internal final fun foo(): jet.Unit + test.Anno(t = ElementType.FIELD: java.lang.annotation.ElementType) internal final var bar: kotlin.Int + internal final fun (): kotlin.Int + internal final fun (/*0*/ : kotlin.Int): kotlin.Unit + test.Anno(t = ElementType.METHOD: java.lang.annotation.ElementType) internal final fun foo(): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.txt index 04d14bc8372..35b8b67f0ff 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.txt @@ -1,10 +1,10 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } internal final class Class { /*primary*/ public constructor Class() - test.Anno() internal final fun foo(): jet.Unit + test.Anno() internal final fun foo(): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.txt index e2728723eee..8dc529d4f7d 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.txt @@ -1,11 +1,11 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } internal final class Class { /*primary*/ public constructor Class() - internal final val property: jet.Int - test.Anno() internal final fun (): jet.Int + internal final val property: kotlin.Int + test.Anno() internal final fun (): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.txt index bb7cd422709..6f98192e1e6 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.txt @@ -1,12 +1,12 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } internal final class Class { /*primary*/ public constructor Class() - test.Anno() internal final var property: jet.Int - internal final fun (): jet.Int - internal final fun (/*0*/ : jet.Int): jet.Unit + test.Anno() internal final var property: kotlin.Int + internal final fun (): kotlin.Int + internal final fun (/*0*/ : kotlin.Int): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.txt index 7b14d56cbe7..c3ead292592 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.txt @@ -1,12 +1,12 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } internal final class Class { /*primary*/ public constructor Class() - internal final var property: jet.Int - internal final fun (): jet.Int - test.Anno() internal final fun (/*0*/ value: jet.Int): jet.Unit + internal final var property: kotlin.Int + internal final fun (): kotlin.Int + test.Anno() internal final fun (/*0*/ value: kotlin.Int): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt index 411d4578ce7..65b24abaee1 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt @@ -1,6 +1,6 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt index 3a2179f2fca..6e5e797fb25 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt @@ -1,6 +1,6 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt index ac74839e44e..b44305123a8 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt @@ -8,8 +8,8 @@ internal final class A { internal class object { /*primary*/ private constructor () - internal final val TEST: jet.Int - internal final fun (): jet.Int + internal final val TEST: kotlin.Int + internal final fun (): kotlin.Int } } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.txt index e3b2e15539e..3bd8f67f256 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.txt @@ -1,17 +1,17 @@ package test -jet.deprecated(value = "Class": jet.String) internal final class Class { +kotlin.deprecated(value = "Class": kotlin.String) internal final class Class { /*primary*/ public constructor Class() - jet.deprecated(value = "class object": jet.String) internal class object { + kotlin.deprecated(value = "class object": kotlin.String) internal class object { /*primary*/ private constructor () } - jet.deprecated(value = "Inner": jet.String) internal final inner class Inner { + kotlin.deprecated(value = "Inner": kotlin.String) internal final inner class Inner { /*primary*/ public constructor Inner() } - jet.deprecated(value = "Nested": jet.String) internal final class Nested { + kotlin.deprecated(value = "Nested": kotlin.String) internal final class Nested { /*primary*/ public constructor Nested() } } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt index e7a7c3223df..174821891f1 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt @@ -1,6 +1,6 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno(/*0*/ t: java.lang.annotation.ElementType) } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.txt index 4f44b4383c1..7fc605e1161 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.txt @@ -1,14 +1,14 @@ package test -internal final annotation class A1 : jet.Annotation { +internal final annotation class A1 : kotlin.Annotation { /*primary*/ public constructor A1() } -internal final annotation class A2 : jet.Annotation { +internal final annotation class A2 : kotlin.Annotation { /*primary*/ public constructor A2() } -internal final annotation class A3 : jet.Annotation { +internal final annotation class A3 : kotlin.Annotation { /*primary*/ public constructor A3() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.txt index 5f5be306449..ca6b02e8067 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.txt @@ -1,6 +1,6 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.txt index 44752969c59..07abea7869c 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.txt @@ -1,5 +1,5 @@ package test -java.lang.annotation.Retention(value = RetentionPolicy.RUNTIME: java.lang.annotation.RetentionPolicy) internal final annotation class Anno : jet.Annotation { +java.lang.annotation.Retention(value = RetentionPolicy.RUNTIME: java.lang.annotation.RetentionPolicy) internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.txt index d7e67ea6484..5172f44f966 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.txt @@ -1,6 +1,6 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.txt index 38adc78e6fe..42350ffd6a8 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.txt @@ -1,53 +1,53 @@ package test -internal final annotation class BooleanAnno : jet.Annotation { - /*primary*/ public constructor BooleanAnno(/*0*/ value: jet.Boolean) - internal final val value: jet.Boolean - internal final fun (): jet.Boolean +internal final annotation class BooleanAnno : kotlin.Annotation { + /*primary*/ public constructor BooleanAnno(/*0*/ value: kotlin.Boolean) + internal final val value: kotlin.Boolean + internal final fun (): kotlin.Boolean } -internal final annotation class ByteAnno : jet.Annotation { - /*primary*/ public constructor ByteAnno(/*0*/ value: jet.Byte) - internal final val value: jet.Byte - internal final fun (): jet.Byte +internal final annotation class ByteAnno : kotlin.Annotation { + /*primary*/ public constructor ByteAnno(/*0*/ value: kotlin.Byte) + internal final val value: kotlin.Byte + internal final fun (): kotlin.Byte } -internal final annotation class CharAnno : jet.Annotation { - /*primary*/ public constructor CharAnno(/*0*/ value: jet.Char) - internal final val value: jet.Char - internal final fun (): jet.Char +internal final annotation class CharAnno : kotlin.Annotation { + /*primary*/ public constructor CharAnno(/*0*/ value: kotlin.Char) + internal final val value: kotlin.Char + internal final fun (): kotlin.Char } -test.IntAnno(value = 42.toInt(): jet.Int) test.ShortAnno(value = 42.toShort(): jet.Short) test.ByteAnno(value = 42.toByte(): jet.Byte) test.LongAnno(value = 42.toLong(): jet.Long) test.CharAnno(value = #65(A): jet.Char) test.BooleanAnno(value = false: jet.Boolean) test.FloatAnno(value = 3.14.toFloat(): jet.Float) test.DoubleAnno(value = 3.14.toDouble(): jet.Double) internal final class Class { +test.IntAnno(value = 42.toInt(): kotlin.Int) test.ShortAnno(value = 42.toShort(): kotlin.Short) test.ByteAnno(value = 42.toByte(): kotlin.Byte) test.LongAnno(value = 42.toLong(): kotlin.Long) test.CharAnno(value = #65(A): kotlin.Char) test.BooleanAnno(value = false: kotlin.Boolean) test.FloatAnno(value = 3.14.toFloat(): kotlin.Float) test.DoubleAnno(value = 3.14.toDouble(): kotlin.Double) internal final class Class { /*primary*/ public constructor Class() } -internal final annotation class DoubleAnno : jet.Annotation { - /*primary*/ public constructor DoubleAnno(/*0*/ value: jet.Double) - internal final val value: jet.Double - internal final fun (): jet.Double +internal final annotation class DoubleAnno : kotlin.Annotation { + /*primary*/ public constructor DoubleAnno(/*0*/ value: kotlin.Double) + internal final val value: kotlin.Double + internal final fun (): kotlin.Double } -internal final annotation class FloatAnno : jet.Annotation { - /*primary*/ public constructor FloatAnno(/*0*/ value: jet.Float) - internal final val value: jet.Float - internal final fun (): jet.Float +internal final annotation class FloatAnno : kotlin.Annotation { + /*primary*/ public constructor FloatAnno(/*0*/ value: kotlin.Float) + internal final val value: kotlin.Float + internal final fun (): kotlin.Float } -internal final annotation class IntAnno : jet.Annotation { - /*primary*/ public constructor IntAnno(/*0*/ value: jet.Int) - internal final val value: jet.Int - internal final fun (): jet.Int +internal final annotation class IntAnno : kotlin.Annotation { + /*primary*/ public constructor IntAnno(/*0*/ value: kotlin.Int) + internal final val value: kotlin.Int + internal final fun (): kotlin.Int } -internal final annotation class LongAnno : jet.Annotation { - /*primary*/ public constructor LongAnno(/*0*/ value: jet.Long) - internal final val value: jet.Long - internal final fun (): jet.Long +internal final annotation class LongAnno : kotlin.Annotation { + /*primary*/ public constructor LongAnno(/*0*/ value: kotlin.Long) + internal final val value: kotlin.Long + internal final fun (): kotlin.Long } -internal final annotation class ShortAnno : jet.Annotation { - /*primary*/ public constructor ShortAnno(/*0*/ value: jet.Short) - internal final val value: jet.Short - internal final fun (): jet.Short +internal final annotation class ShortAnno : kotlin.Annotation { + /*primary*/ public constructor ShortAnno(/*0*/ value: kotlin.Short) + internal final val value: kotlin.Short + internal final fun (): kotlin.Short } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.txt index 54d9e437220..b317a61f88b 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.txt @@ -1,15 +1,15 @@ package test -internal final annotation class Anno : jet.Annotation { - /*primary*/ public constructor Anno(/*0*/ int: jet.Int, /*1*/ string: jet.String, /*2*/ double: jet.Double) - internal final val double: jet.Double - internal final fun (): jet.Double - internal final val int: jet.Int - internal final fun (): jet.Int - internal final val string: jet.String - internal final fun (): jet.String +internal final annotation class Anno : kotlin.Annotation { + /*primary*/ public constructor Anno(/*0*/ int: kotlin.Int, /*1*/ string: kotlin.String, /*2*/ double: kotlin.Double) + internal final val double: kotlin.Double + internal final fun (): kotlin.Double + internal final val int: kotlin.Int + internal final fun (): kotlin.Int + internal final val string: kotlin.String + internal final fun (): kotlin.String } -test.Anno(double = 3.14.toDouble(): jet.Double, int = 42.toInt(): jet.Int, string = "OK": jet.String) internal final class Class { +test.Anno(double = 3.14.toDouble(): kotlin.Double, int = 42.toInt(): kotlin.Int, string = "OK": kotlin.String) internal final class Class { /*primary*/ public constructor Class() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.txt index 646a51789ea..33cfe343b75 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.txt @@ -1,8 +1,8 @@ package test -test.Anno() internal val x: jet.Int - internal fun (): jet.Int +test.Anno() internal val x: kotlin.Int + internal fun (): kotlin.Int -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt index b81fab515e3..05fcb0ac582 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt @@ -1,9 +1,9 @@ package test -test.Anno(t = ElementType.FIELD: java.lang.annotation.ElementType) internal val bar: jet.Int - internal fun (): jet.Int -test.Anno(t = ElementType.METHOD: java.lang.annotation.ElementType) internal fun foo(): jet.Unit +test.Anno(t = ElementType.FIELD: java.lang.annotation.ElementType) internal val bar: kotlin.Int + internal fun (): kotlin.Int +test.Anno(t = ElementType.METHOD: java.lang.annotation.ElementType) internal fun foo(): kotlin.Unit -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno(/*0*/ t: java.lang.annotation.ElementType) } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.txt index c961286244b..4783daf41d6 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.txt @@ -1,7 +1,7 @@ package test -test.Anno() internal fun function(): jet.Unit +test.Anno() internal fun function(): kotlin.Unit -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.txt index 982b5b1115a..f39ae47fe92 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.txt @@ -1,8 +1,8 @@ package test -internal val property: jet.Int - test.Anno() internal fun (): jet.Int +internal val property: kotlin.Int + test.Anno() internal fun (): kotlin.Int -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.txt index 1a61271ee8b..31c1b1fdf12 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.txt @@ -1,9 +1,9 @@ package test -test.Anno() internal var property: jet.Int - internal fun (): jet.Int - internal fun (/*0*/ : jet.Int): jet.Unit +test.Anno() internal var property: kotlin.Int + internal fun (): kotlin.Int + internal fun (/*0*/ : kotlin.Int): kotlin.Unit -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.txt index ae4036864d7..22bb8faa2dd 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.txt @@ -1,9 +1,9 @@ package test -internal var property: jet.Int - internal fun (): jet.Int - test.Anno() internal fun (/*0*/ value: jet.Int): jet.Unit +internal var property: kotlin.Int + internal fun (): kotlin.Int + test.Anno() internal fun (/*0*/ value: kotlin.Int): kotlin.Unit -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.txt index 9d791272851..be17a96e471 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.txt @@ -1,15 +1,15 @@ package test -internal final annotation class A : jet.Annotation { +internal final annotation class A : kotlin.Annotation { /*primary*/ public constructor A() } -internal final annotation class B : jet.Annotation { +internal final annotation class B : kotlin.Annotation { /*primary*/ public constructor B() } internal final class Class { - /*primary*/ public constructor Class(/*0*/ test.A() x: jet.Int, /*1*/ test.B() y: jet.String) - test.A() internal final val x: jet.Int - internal final fun (): jet.Int + /*primary*/ public constructor Class(/*0*/ test.A() x: kotlin.Int, /*1*/ test.B() y: kotlin.String) + test.A() internal final val x: kotlin.Int + internal final fun (): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt index 7e784c6c06d..44b814e785f 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt @@ -1,25 +1,25 @@ package test -internal final annotation class A : jet.Annotation { +internal final annotation class A : kotlin.Annotation { /*primary*/ public constructor A() } -internal final annotation class B : jet.Annotation { +internal final annotation class B : kotlin.Annotation { /*primary*/ public constructor B() } -internal final enum class E : jet.Enum { - /*primary*/ private constructor E(/*0*/ test.A() x: jet.String, /*1*/ test.B() y: jet.Int) - test.A() internal final val x: jet.String - internal final fun (): jet.String - test.B() internal final val y: jet.Int - internal final fun (): jet.Int - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int +internal final enum class E : kotlin.Enum { + /*primary*/ private constructor E(/*0*/ test.A() x: kotlin.String, /*1*/ test.B() y: kotlin.Int) + test.A() internal final val x: kotlin.String + internal final fun (): kotlin.String + test.B() internal final val y: kotlin.Int + internal final fun (): kotlin.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object { /*primary*/ private constructor () - public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.E - public final /*synthesized*/ fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E + public final /*synthesized*/ fun values(): kotlin.Array } } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.txt index 64ee1779d2e..7b1b075ce94 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.txt @@ -1,7 +1,7 @@ package test -internal fun jet.Int.foo(/*0*/ test.A() x: jet.Int): jet.Unit +internal fun kotlin.Int.foo(/*0*/ test.A() x: kotlin.Int): kotlin.Unit -internal final annotation class A : jet.Annotation { +internal final annotation class A : kotlin.Annotation { /*primary*/ public constructor A() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt index 1f5dc2c9061..073b165297f 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt @@ -1,10 +1,10 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } internal final class Class { /*primary*/ public constructor Class() - internal final fun jet.String.foo(/*0*/ test.Anno() x: jet.Int): jet.Int + internal final fun kotlin.String.foo(/*0*/ test.Anno() x: kotlin.Int): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.txt index 2f274ec3dd9..a071d5ecd84 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.txt @@ -1,12 +1,12 @@ package test -internal final annotation class A : jet.Annotation { +internal final annotation class A : kotlin.Annotation { /*primary*/ public constructor A() } internal final class Class { /*primary*/ public constructor Class() - internal final var jet.Int.foo: jet.Int - internal final fun jet.Int.(): jet.Int - internal final fun jet.Int.(/*0*/ test.A() value: jet.Int): jet.Unit + internal final var kotlin.Int.foo: kotlin.Int + internal final fun kotlin.Int.(): kotlin.Int + internal final fun kotlin.Int.(/*0*/ test.A() value: kotlin.Int): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.txt index b98e8a524e2..6f983d509e5 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.txt @@ -1,10 +1,10 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } internal final class Class { /*primary*/ public constructor Class() - internal final fun foo(/*0*/ test.Anno() x: jet.String): jet.Unit + internal final fun foo(/*0*/ test.Anno() x: kotlin.String): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.txt index b5954ec6d62..0bb1077adbc 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.txt @@ -1,9 +1,9 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } internal trait Trait { - internal open fun foo(/*0*/ test.Anno() x: jet.String): jet.Int + internal open fun foo(/*0*/ test.Anno() x: kotlin.String): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.txt index 94149cbd629..fecebf555ba 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.txt @@ -1,20 +1,20 @@ package test -internal fun bar(/*0*/ test.A() test.B() test.C() test.D() x: jet.Int): jet.Unit -internal fun foo(/*0*/ test.A() test.B() x: jet.Int, /*1*/ test.A() test.C() y: jet.Double, /*2*/ test.B() test.C() test.D() z: jet.String): jet.Unit +internal fun bar(/*0*/ test.A() test.B() test.C() test.D() x: kotlin.Int): kotlin.Unit +internal fun foo(/*0*/ test.A() test.B() x: kotlin.Int, /*1*/ test.A() test.C() y: kotlin.Double, /*2*/ test.B() test.C() test.D() z: kotlin.String): kotlin.Unit -internal final annotation class A : jet.Annotation { +internal final annotation class A : kotlin.Annotation { /*primary*/ public constructor A() } -internal final annotation class B : jet.Annotation { +internal final annotation class B : kotlin.Annotation { /*primary*/ public constructor B() } -internal final annotation class C : jet.Annotation { +internal final annotation class C : kotlin.Annotation { /*primary*/ public constructor C() } -internal final annotation class D : jet.Annotation { +internal final annotation class D : kotlin.Annotation { /*primary*/ public constructor D() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.txt index 1350c7db2d3..7cf6937db80 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.txt @@ -1,12 +1,12 @@ package test -internal final annotation class A : jet.Annotation { +internal final annotation class A : kotlin.Annotation { /*primary*/ public constructor A() } internal final class Class { /*primary*/ public constructor Class() - internal final var foo: jet.Int - internal final fun (): jet.Int - internal final fun (/*0*/ test.A() value: jet.Int): jet.Unit + internal final var foo: kotlin.Int + internal final fun (): kotlin.Int + internal final fun (/*0*/ test.A() value: kotlin.Int): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.txt index 5eb8fbc1d11..eda01e83b37 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.txt @@ -1,7 +1,7 @@ package test -internal fun foo(/*0*/ test.Anno() x: jet.Int): jet.Unit +internal fun foo(/*0*/ test.Anno() x: kotlin.Int): kotlin.Unit -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.txt index 0a7d7663e3c..0ec4bce6951 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.txt @@ -1,13 +1,13 @@ package test -internal var foo: jet.Int - internal fun (): jet.Int - internal fun (/*0*/ test.A() test.B() value: jet.Int): jet.Unit +internal var foo: kotlin.Int + internal fun (): kotlin.Int + internal fun (/*0*/ test.A() test.B() value: kotlin.Int): kotlin.Unit -internal final annotation class A : jet.Annotation { +internal final annotation class A : kotlin.Annotation { /*primary*/ public constructor A() } -internal final annotation class B : jet.Annotation { +internal final annotation class B : kotlin.Annotation { /*primary*/ public constructor B() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt index cd0c4b43ead..af76793d7b7 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt @@ -1,11 +1,11 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } internal final class Class { /*primary*/ public constructor Class() - test.Anno() internal final val property: jet.Int - internal final fun (): jet.Int + test.Anno() internal final val property: kotlin.Int + internal final fun (): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt index 470a65baeb1..8d6eaff9e72 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt @@ -1,6 +1,6 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } @@ -9,7 +9,7 @@ internal final class Class { internal class object { /*primary*/ private constructor () - test.Anno() internal final val property: jet.Int - internal final fun (): jet.Int + test.Anno() internal final val property: kotlin.Int + internal final fun (): kotlin.Int } } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt index 475c0c41b6d..198c49875e9 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt @@ -2,22 +2,22 @@ package test internal final class Class { /*primary*/ public constructor Class() - test.DoubleAnno() internal final val jet.Double.extension: jet.Int - internal final fun jet.Double.(): jet.Int - test.IntAnno() internal final val jet.Int.extension: jet.Int - internal final fun jet.Int.(): jet.Int - test.StringAnno() internal final val jet.String.extension: jet.String - internal final fun jet.String.(): jet.String + test.DoubleAnno() internal final val kotlin.Double.extension: kotlin.Int + internal final fun kotlin.Double.(): kotlin.Int + test.IntAnno() internal final val kotlin.Int.extension: kotlin.Int + internal final fun kotlin.Int.(): kotlin.Int + test.StringAnno() internal final val kotlin.String.extension: kotlin.String + internal final fun kotlin.String.(): kotlin.String } -internal final annotation class DoubleAnno : jet.Annotation { +internal final annotation class DoubleAnno : kotlin.Annotation { /*primary*/ public constructor DoubleAnno() } -internal final annotation class IntAnno : jet.Annotation { +internal final annotation class IntAnno : kotlin.Annotation { /*primary*/ public constructor IntAnno() } -internal final annotation class StringAnno : jet.Annotation { +internal final annotation class StringAnno : kotlin.Annotation { /*primary*/ public constructor StringAnno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt index cc621b21055..1d022c66ed8 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt @@ -1,20 +1,20 @@ package test -test.DoubleAnno() internal val jet.Double.extension: jet.Int - internal fun jet.Double.(): jet.Int -test.IntAnno() internal val jet.Int.extension: jet.Int - internal fun jet.Int.(): jet.Int -test.StringAnno() internal val jet.String.extension: jet.String - internal fun jet.String.(): jet.String +test.DoubleAnno() internal val kotlin.Double.extension: kotlin.Int + internal fun kotlin.Double.(): kotlin.Int +test.IntAnno() internal val kotlin.Int.extension: kotlin.Int + internal fun kotlin.Int.(): kotlin.Int +test.StringAnno() internal val kotlin.String.extension: kotlin.String + internal fun kotlin.String.(): kotlin.String -internal final annotation class DoubleAnno : jet.Annotation { +internal final annotation class DoubleAnno : kotlin.Annotation { /*primary*/ public constructor DoubleAnno() } -internal final annotation class IntAnno : jet.Annotation { +internal final annotation class IntAnno : kotlin.Annotation { /*primary*/ public constructor IntAnno() } -internal final annotation class StringAnno : jet.Annotation { +internal final annotation class StringAnno : kotlin.Annotation { /*primary*/ public constructor StringAnno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt index e5c0ca78764..fc1db5cc4c8 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt @@ -1,6 +1,6 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } @@ -8,7 +8,7 @@ internal final class Class { /*primary*/ public constructor Class() internal trait Trait { - test.Anno() internal abstract val property: jet.Int - internal abstract fun (): jet.Int + test.Anno() internal abstract val property: kotlin.Int + internal abstract fun (): kotlin.Int } } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt index 4b34a72e986..0da708e5673 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt @@ -1,8 +1,8 @@ package test -test.Anno() internal val property: jet.Int - internal fun (): jet.Int +test.Anno() internal val property: kotlin.Int + internal fun (): kotlin.Int -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt index ce135f1b0d7..bc28d107c70 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt @@ -1,10 +1,10 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } internal trait Trait { - test.Anno() internal abstract val property: jet.Int - internal abstract fun (): jet.Int + test.Anno() internal abstract val property: kotlin.Int + internal abstract fun (): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt index 54cb5abcbe1..ad4b83865fd 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt @@ -1,6 +1,6 @@ package test -internal final annotation class Anno : jet.Annotation { +internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } @@ -8,7 +8,7 @@ internal trait Trait { internal class object { /*primary*/ private constructor () - test.Anno() internal final val property: jet.Int - internal final fun (): jet.Int + test.Anno() internal final val property: kotlin.Int + internal final fun (): kotlin.Int } } diff --git a/compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt b/compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt index 93cb14458bc..05ec00fb225 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt +++ b/compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt @@ -2,13 +2,13 @@ package test internal final class ConstructorTypeParamClassObjectConflict { /*primary*/ public constructor ConstructorTypeParamClassObjectConflict() - internal final val some: jet.Int - internal final fun (): jet.Int + internal final val some: kotlin.Int + internal final fun (): kotlin.Int internal class object { /*primary*/ private constructor () - internal final val test: jet.Int - internal final fun (): jet.Int + internal final val test: kotlin.Int + internal final fun (): kotlin.Int } } @@ -27,40 +27,40 @@ internal final class ConstructorTypeParamClassObjectTypeConflict { internal final class TestClassObjectAndClassConflict { /*primary*/ public constructor TestClassObjectAndClassConflict() - internal final val bla: jet.String - internal final fun (): jet.String - internal final val some: jet.String - internal final fun (): jet.String + internal final val bla: kotlin.String + internal final fun (): kotlin.String + internal final val some: kotlin.String + internal final fun (): kotlin.String internal class object { /*primary*/ private constructor () - internal final val bla: jet.Int - internal final fun (): jet.Int + internal final val bla: kotlin.Int + internal final fun (): kotlin.Int } } internal final class TestConstructorParamClassObjectConflict { - /*primary*/ public constructor TestConstructorParamClassObjectConflict(/*0*/ test: jet.String) - internal final val some: jet.String - internal final fun (): jet.String + /*primary*/ public constructor TestConstructorParamClassObjectConflict(/*0*/ test: kotlin.String) + internal final val some: kotlin.String + internal final fun (): kotlin.String internal class object { /*primary*/ private constructor () - internal final val test: jet.Int - internal final fun (): jet.Int + internal final val test: kotlin.Int + internal final fun (): kotlin.Int } } internal final class TestConstructorValClassObjectConflict { - /*primary*/ public constructor TestConstructorValClassObjectConflict(/*0*/ test: jet.String) - internal final val some: jet.String - internal final fun (): jet.String - internal final val test: jet.String - internal final fun (): jet.String + /*primary*/ public constructor TestConstructorValClassObjectConflict(/*0*/ test: kotlin.String) + internal final val some: kotlin.String + internal final fun (): kotlin.String + internal final val test: kotlin.String + internal final fun (): kotlin.String internal class object { /*primary*/ private constructor () - internal final val test: jet.Int - internal final fun (): jet.Int + internal final val test: kotlin.Int + internal final fun (): kotlin.Int } } diff --git a/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt b/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt index 1c20ee6c133..ad5d12656a9 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt +++ b/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt @@ -1,13 +1,13 @@ package test -internal final enum class EnumWithGenericConstructorParameter : jet.Enum { - /*primary*/ private constructor EnumWithGenericConstructorParameter(/*0*/ list: jet.List?) - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int +internal final enum class EnumWithGenericConstructorParameter : kotlin.Enum { + /*primary*/ private constructor EnumWithGenericConstructorParameter(/*0*/ list: kotlin.List?) + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object { /*primary*/ private constructor () - public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.EnumWithGenericConstructorParameter - public final /*synthesized*/ fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumWithGenericConstructorParameter + public final /*synthesized*/ fun values(): kotlin.Array } } diff --git a/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt b/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt index 2904a2d7216..6e6523b8cce 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt +++ b/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt @@ -1,13 +1,13 @@ package test -internal final enum class EnumWithPrimitiveConstructorParameter : jet.Enum { - /*primary*/ private constructor EnumWithPrimitiveConstructorParameter(/*0*/ b: jet.Boolean) - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int +internal final enum class EnumWithPrimitiveConstructorParameter : kotlin.Enum { + /*primary*/ private constructor EnumWithPrimitiveConstructorParameter(/*0*/ b: kotlin.Boolean) + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object { /*primary*/ private constructor () - public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.EnumWithPrimitiveConstructorParameter - public final /*synthesized*/ fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumWithPrimitiveConstructorParameter + public final /*synthesized*/ fun values(): kotlin.Array } } diff --git a/compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.txt b/compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.txt index f8220df53ad..33532815dcc 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.txt +++ b/compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.txt @@ -5,8 +5,8 @@ public trait A { internal open fun foo(): T } -public final class B : test.A { +public final class B : test.A { /*primary*/ public constructor B() - internal open override /*1*/ fun bar(): jet.String - internal open override /*1*/ /*fake_override*/ fun foo(): jet.String + internal open override /*1*/ fun bar(): kotlin.String + internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.String } diff --git a/compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.txt b/compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.txt index 7d00bc1df7c..0519ae1fdbf 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.txt +++ b/compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.txt @@ -2,9 +2,9 @@ package test internal open class Class : test.Trait { /*primary*/ public constructor Class() - internal open override /*1*/ /*fake_override*/ fun f(/*0*/ a: jet.String): jet.Unit + internal open override /*1*/ /*fake_override*/ fun f(/*0*/ a: kotlin.String): kotlin.Unit } internal trait Trait { - internal open fun f(/*0*/ a: jet.String): jet.Unit + internal open fun f(/*0*/ a: kotlin.String): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/class/NamedObject.txt b/compiler/testData/loadJava/compiledKotlin/class/NamedObject.txt index 0178e1dc0f9..d6ee44c76fa 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/NamedObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/class/NamedObject.txt @@ -2,14 +2,14 @@ package test public object Obj { /*primary*/ private constructor Obj() - public final val v: jet.String - public final fun (): jet.String - public final fun f(): jet.String + public final val v: kotlin.String + public final fun (): kotlin.String + public final fun f(): kotlin.String public class object : test.Obj { /*primary*/ private constructor () - public final override /*1*/ /*fake_override*/ val v: jet.String - public final override /*1*/ /*fake_override*/ fun (): jet.String - public final override /*1*/ /*fake_override*/ fun f(): jet.String + public final override /*1*/ /*fake_override*/ val v: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ fun f(): kotlin.String } } diff --git a/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.txt b/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.txt index 72a57deaefc..8a0bf6b9da5 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.txt @@ -5,15 +5,15 @@ public final class Outer { public object Obj { /*primary*/ private constructor Obj() - public final val v: jet.String - public final fun (): jet.String - public final fun f(): jet.String + public final val v: kotlin.String + public final fun (): kotlin.String + public final fun f(): kotlin.String public class object : test.Outer.Obj { /*primary*/ private constructor () - public final override /*1*/ /*fake_override*/ val v: jet.String - public final override /*1*/ /*fake_override*/ fun (): jet.String - public final override /*1*/ /*fake_override*/ fun f(): jet.String + public final override /*1*/ /*fake_override*/ val v: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ fun f(): kotlin.String } } } diff --git a/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.txt index 1244d6d3c6f..11d498af5b0 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.txt @@ -8,15 +8,15 @@ public final class Outer { public object Obj { /*primary*/ private constructor Obj() - public final val v: jet.String - public final fun (): jet.String - public final fun f(): jet.String + public final val v: kotlin.String + public final fun (): kotlin.String + public final fun f(): kotlin.String public class object : test.Outer.Obj { /*primary*/ private constructor () - public final override /*1*/ /*fake_override*/ val v: jet.String - public final override /*1*/ /*fake_override*/ fun (): jet.String - public final override /*1*/ /*fake_override*/ fun f(): jet.String + public final override /*1*/ /*fake_override*/ val v: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ fun f(): kotlin.String } } } diff --git a/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.txt b/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.txt index 1428c2f25c9..14a06ab2cf9 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.txt @@ -9,15 +9,15 @@ public object Outer { public object Obj { /*primary*/ private constructor Obj() - public final val v: jet.String - public final fun (): jet.String - public final fun f(): jet.String + public final val v: kotlin.String + public final fun (): kotlin.String + public final fun f(): kotlin.String public class object : test.Outer.Obj { /*primary*/ private constructor () - public final override /*1*/ /*fake_override*/ val v: jet.String - public final override /*1*/ /*fake_override*/ fun (): jet.String - public final override /*1*/ /*fake_override*/ fun f(): jet.String + public final override /*1*/ /*fake_override*/ val v: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ fun f(): kotlin.String } } } diff --git a/compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt b/compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt index a6406a1ff3a..73fcd1c9e3e 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt +++ b/compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt @@ -1,18 +1,18 @@ package test -internal val x: jet.Int - internal fun (): jet.Int +internal val x: kotlin.Int + internal fun (): kotlin.Int public object Obj { /*primary*/ private constructor Obj() - public final val v: jet.String - public final fun (): jet.String - public final fun f(): jet.String + public final val v: kotlin.String + public final fun (): kotlin.String + public final fun f(): kotlin.String public class object : test.Obj { /*primary*/ private constructor () - public final override /*1*/ /*fake_override*/ val v: jet.String - public final override /*1*/ /*fake_override*/ fun (): jet.String - public final override /*1*/ /*fake_override*/ fun f(): jet.String + public final override /*1*/ /*fake_override*/ val v: kotlin.String + public final override /*1*/ /*fake_override*/ fun (): kotlin.String + public final override /*1*/ /*fake_override*/ fun f(): kotlin.String } } diff --git a/compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.txt b/compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.txt index 808dd47b05b..78acb1f5ba4 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.txt +++ b/compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.txt @@ -1,5 +1,5 @@ package test public trait SingleAbstractMethod { - internal abstract fun foo(): jet.Unit + internal abstract fun foo(): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.txt b/compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.txt index 8de44a50ca5..41bbfec1371 100644 --- a/compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.txt +++ b/compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.txt @@ -2,5 +2,5 @@ package test internal final class ClassParamUsedInFun { /*primary*/ public constructor ClassParamUsedInFun() - internal final fun f(/*0*/ t: T): jet.Int + internal final fun f(/*0*/ t: T): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.txt b/compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.txt index 0a5f6294b9e..0c579f2b9f6 100644 --- a/compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.txt +++ b/compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.txt @@ -2,5 +2,5 @@ package test internal final class ClassParamUsedInFun { /*primary*/ public constructor ClassParamUsedInFun() - internal final fun f(/*0*/ t: T): jet.Int + internal final fun f(/*0*/ t: T): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.txt b/compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.txt index a051b3cc094..9ce1d8c662b 100644 --- a/compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.txt +++ b/compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.txt @@ -1,10 +1,10 @@ package test internal trait A { - internal open fun f(): jet.String + internal open fun f(): kotlin.String } internal final class B : test.A { /*primary*/ public constructor B() - internal open override /*1*/ /*fake_override*/ fun f(): jet.String + internal open override /*1*/ /*fake_override*/ fun f(): kotlin.String } diff --git a/compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.txt b/compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.txt index d4d7aa43800..899b56ad902 100644 --- a/compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.txt +++ b/compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.txt @@ -5,7 +5,7 @@ internal open class Base { internal final fun foo(): T } -internal final class Inh : test.Base { +internal final class Inh : test.Base { /*primary*/ public constructor Inh() - internal final override /*1*/ /*fake_override*/ fun foo(): jet.String + internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.String } diff --git a/compiler/testData/loadJava/compiledKotlin/classFun/TraitFinalFun.txt b/compiler/testData/loadJava/compiledKotlin/classFun/TraitFinalFun.txt index 32e6e0c27d8..7014130c8e1 100644 --- a/compiler/testData/loadJava/compiledKotlin/classFun/TraitFinalFun.txt +++ b/compiler/testData/loadJava/compiledKotlin/classFun/TraitFinalFun.txt @@ -1,5 +1,5 @@ package test internal trait A { - internal final fun f(): jet.String + internal final fun f(): kotlin.String } diff --git a/compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.txt b/compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.txt index 4a8fe20f6a0..7017cf7c480 100644 --- a/compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.txt +++ b/compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.txt @@ -1,5 +1,5 @@ package test internal trait A { - internal open fun f(): jet.String + internal open fun f(): kotlin.String } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.txt index 89cc23883d8..004675b93fa 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.txt @@ -5,7 +5,7 @@ internal final class ClassObjectDeclaresProperty { internal class object { /*primary*/ private constructor () - internal final val i: jet.Int - internal final fun (): jet.Int + internal final val i: kotlin.Int + internal final fun (): kotlin.Int } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.txt index b4be4a2ec5a..a00a36d63dc 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.txt @@ -5,8 +5,8 @@ internal final class ClassObjectDeclaresProperty { internal class object { /*primary*/ private constructor () - internal final var s: jet.String - internal final fun (): jet.String - internal final fun (/*0*/ : jet.String): jet.Unit + internal final var s: kotlin.String + internal final fun (): kotlin.String + internal final fun (/*0*/ : kotlin.String): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt index 042507d9329..6759af082b2 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt @@ -6,7 +6,7 @@ internal trait Bbb { internal final class ClassObjectExtendsTraitWithTP { /*primary*/ public constructor ClassObjectExtendsTraitWithTP() - internal class object : test.Bbb { + internal class object : test.Bbb { /*primary*/ private constructor () } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.txt index 8396336163f..28cd37823fb 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.txt @@ -2,12 +2,12 @@ package test internal final class A { /*primary*/ public constructor A() - internal final val other: jet.Int - internal final fun (): jet.Int + internal final val other: kotlin.Int + internal final fun (): kotlin.Int internal class object { /*primary*/ private constructor () - internal final val some: jet.Int - internal final fun (): jet.Int + internal final val some: kotlin.Int + internal final fun (): kotlin.Int } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.txt b/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.txt index e7d2939c2f5..6f31b31c9ea 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.txt @@ -2,14 +2,14 @@ package test internal final class A : test.T { /*primary*/ public constructor A() - internal open override /*1*/ fun foo(): jet.Int + internal open override /*1*/ fun foo(): kotlin.Int internal class object : test.T { /*primary*/ private constructor () - internal open override /*1*/ /*delegation*/ fun foo(): jet.Int + internal open override /*1*/ /*delegation*/ fun foo(): kotlin.Int } } internal trait T { - internal abstract fun foo(): jet.Int + internal abstract fun foo(): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.txt index ba01845e53e..40371c105fb 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.txt @@ -5,8 +5,8 @@ internal final class TestFirst { internal class object { /*primary*/ private constructor () - internal final fun testing(/*0*/ a: test.TestFirst.InnerClass): jet.Int - internal final fun testing(/*0*/ a: test.TestFirst.NotInnerClass): jet.Int + internal final fun testing(/*0*/ a: test.TestFirst.InnerClass): kotlin.Int + internal final fun testing(/*0*/ a: test.TestFirst.NotInnerClass): kotlin.Int } internal final inner class InnerClass { diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.txt b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.txt index d75e4b1e99c..5a7e3545e1a 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.txt @@ -5,22 +5,22 @@ internal final class Test { internal class object { /*primary*/ private constructor () - public final val prop1: jet.Int - public final fun (): jet.Int - public final var prop2: jet.Int - public final fun (): jet.Int - protected final fun (/*0*/ : jet.Int): jet.Unit - public final val prop3: jet.Int - public final fun (): jet.Int - internal final var prop4: jet.Int - internal final fun (): jet.Int - internal final fun (/*0*/ : jet.Int): jet.Unit - public final var prop5: jet.Int - public final fun (): jet.Int - public final fun (/*0*/ : jet.Int): jet.Unit - public final var prop7: jet.Int - public final fun (): jet.Int - public final fun (/*0*/ i: jet.Int): jet.Unit - internal final fun incProp4(): jet.Unit + public final val prop1: kotlin.Int + public final fun (): kotlin.Int + public final var prop2: kotlin.Int + public final fun (): kotlin.Int + protected final fun (/*0*/ : kotlin.Int): kotlin.Unit + public final val prop3: kotlin.Int + public final fun (): kotlin.Int + internal final var prop4: kotlin.Int + internal final fun (): kotlin.Int + internal final fun (/*0*/ : kotlin.Int): kotlin.Unit + public final var prop5: kotlin.Int + public final fun (): kotlin.Int + public final fun (/*0*/ : kotlin.Int): kotlin.Unit + public final var prop7: kotlin.Int + public final fun (): kotlin.Int + public final fun (/*0*/ i: kotlin.Int): kotlin.Unit + internal final fun incProp4(): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.txt b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.txt index e4687a6dc33..696b7d31590 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.txt @@ -4,22 +4,22 @@ internal trait Test { internal class object { /*primary*/ private constructor () - public final val prop1: jet.Int - public final fun (): jet.Int - public final var prop2: jet.Int - public final fun (): jet.Int - protected final fun (/*0*/ : jet.Int): jet.Unit - public final val prop3: jet.Int - public final fun (): jet.Int - internal final var prop4: jet.Int - internal final fun (): jet.Int - internal final fun (/*0*/ : jet.Int): jet.Unit - public final var prop5: jet.Int - public final fun (): jet.Int - public final fun (/*0*/ : jet.Int): jet.Unit - public final var prop7: jet.Int - public final fun (): jet.Int - public final fun (/*0*/ i: jet.Int): jet.Unit - internal final fun incProp4(): jet.Unit + public final val prop1: kotlin.Int + public final fun (): kotlin.Int + public final var prop2: kotlin.Int + public final fun (): kotlin.Int + protected final fun (/*0*/ : kotlin.Int): kotlin.Unit + public final val prop3: kotlin.Int + public final fun (): kotlin.Int + internal final var prop4: kotlin.Int + internal final fun (): kotlin.Int + internal final fun (/*0*/ : kotlin.Int): kotlin.Unit + public final var prop5: kotlin.Int + public final fun (): kotlin.Int + public final fun (/*0*/ : kotlin.Int): kotlin.Unit + public final var prop7: kotlin.Int + public final fun (): kotlin.Int + public final fun (/*0*/ i: kotlin.Int): kotlin.Unit + internal final fun incProp4(): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.txt b/compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.txt index 77b5cb2fae6..2bee4aa292c 100644 --- a/compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.txt +++ b/compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.txt @@ -1,5 +1,5 @@ package test internal final class ClassWithConstructor1 { - /*primary*/ public constructor ClassWithConstructor1(/*0*/ p: jet.Int) + /*primary*/ public constructor ClassWithConstructor1(/*0*/ p: kotlin.Int) } diff --git a/compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.txt b/compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.txt index b4133ae5b42..86dc3dfa152 100644 --- a/compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.txt +++ b/compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.txt @@ -1,5 +1,5 @@ package test internal final class ClassWithConstructorWithValueParamWithDefaultValue { - /*primary*/ public constructor ClassWithConstructorWithValueParamWithDefaultValue(/*0*/ p: jet.Int = ...) + /*primary*/ public constructor ClassWithConstructorWithValueParamWithDefaultValue(/*0*/ p: kotlin.Int = ...) } diff --git a/compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.txt b/compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.txt index e3f3093b611..a864fcd10fb 100644 --- a/compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.txt +++ b/compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.txt @@ -1,5 +1,5 @@ package test internal final class TestConstructor { - /*primary*/ public constructor TestConstructor(/*0*/ p: jet.Int = ..., /*1*/ s: jet.Int) + /*primary*/ public constructor TestConstructor(/*0*/ p: kotlin.Int = ..., /*1*/ s: kotlin.Int) } diff --git a/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.txt b/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.txt index c3faeebbcd5..96356eee4c4 100644 --- a/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.txt +++ b/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.txt @@ -1,7 +1,7 @@ package test internal final class TestingKotlinCollections { - /*primary*/ public constructor TestingKotlinCollections(/*0*/ arguments: jet.Collection) - internal final val arguments: jet.Collection - internal final fun (): jet.Collection + /*primary*/ public constructor TestingKotlinCollections(/*0*/ arguments: kotlin.Collection) + internal final val arguments: kotlin.Collection + internal final fun (): kotlin.Collection } diff --git a/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.txt b/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.txt index 7549ca5e3af..cc59e5ed368 100644 --- a/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.txt +++ b/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.txt @@ -1,5 +1,5 @@ package test internal final class TestConstructor { - /*primary*/ public constructor TestConstructor(/*0*/ p: jet.Int = ..., /*1*/ d: jet.Int = ...) + /*primary*/ public constructor TestConstructor(/*0*/ p: kotlin.Int = ..., /*1*/ d: kotlin.Int = ...) } diff --git a/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt b/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt index f106db7d564..c93ae74ebe1 100644 --- a/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt +++ b/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt @@ -1,5 +1,5 @@ package test internal final class ClassWithConstructorAndTypeParameter { - /*primary*/ public constructor ClassWithConstructorAndTypeParameter(/*0*/ q: jet.Int) + /*primary*/ public constructor ClassWithConstructorAndTypeParameter(/*0*/ q: kotlin.Int) } diff --git a/compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.txt b/compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.txt index 7597a44df62..a40540fa9c1 100644 --- a/compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.txt +++ b/compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.txt @@ -4,6 +4,6 @@ internal final class A { /*primary*/ public constructor A() internal final class TestConstructor { - /*primary*/ public constructor TestConstructor(/*0*/ p: jet.Int = ...) + /*primary*/ public constructor TestConstructor(/*0*/ p: kotlin.Int = ...) } } diff --git a/compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.txt b/compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.txt index a3e6628c2a7..833f1094727 100644 --- a/compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.txt +++ b/compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.txt @@ -1,5 +1,5 @@ package test internal final class TestConstructor { - /*primary*/ private constructor TestConstructor(/*0*/ p: jet.Int = ...) + /*primary*/ private constructor TestConstructor(/*0*/ p: kotlin.Int = ...) } diff --git a/compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.txt b/compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.txt index 12c2c642461..bacfa4e5da2 100644 --- a/compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.txt +++ b/compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.txt @@ -1,5 +1,5 @@ package test internal final class A { - /*primary*/ public constructor A(/*0*/ vararg a: jet.Int /*jet.IntArray*/, /*1*/ f: () -> jet.Unit) + /*primary*/ public constructor A(/*0*/ vararg a: kotlin.Int /*kotlin.IntArray*/, /*1*/ f: () -> kotlin.Unit) } diff --git a/compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.txt b/compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.txt index 4b64664b382..0e7217d20a8 100644 --- a/compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.txt +++ b/compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.txt @@ -1,5 +1,5 @@ package test internal final class A { - /*primary*/ public constructor A(/*0*/ vararg a: jet.Int /*jet.IntArray*/) + /*primary*/ public constructor A(/*0*/ vararg a: kotlin.Int /*kotlin.IntArray*/) } diff --git a/compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.txt b/compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.txt index f08e5751309..4d21f83acd2 100644 --- a/compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.txt +++ b/compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.txt @@ -1,13 +1,13 @@ package test -jet.data() internal final class DataClass { - /*primary*/ public constructor DataClass(/*0*/ x: jet.String, /*1*/ y: jet.Int, /*2*/ z: jet.Double) - internal final var x: jet.String - internal final fun (): jet.String - internal final fun (/*0*/ : jet.String): jet.Unit - internal final val z: jet.Double - internal final fun (): jet.Double - internal final /*synthesized*/ fun component1(): jet.String - internal final /*synthesized*/ fun component2(): jet.Double - internal final /*synthesized*/ fun copy(/*0*/ x: jet.String = ..., /*1*/ y: jet.Int, /*2*/ z: jet.Double = ...): test.DataClass +kotlin.data() internal final class DataClass { + /*primary*/ public constructor DataClass(/*0*/ x: kotlin.String, /*1*/ y: kotlin.Int, /*2*/ z: kotlin.Double) + internal final var x: kotlin.String + internal final fun (): kotlin.String + internal final fun (/*0*/ : kotlin.String): kotlin.Unit + internal final val z: kotlin.Double + internal final fun (): kotlin.Double + internal final /*synthesized*/ fun component1(): kotlin.String + internal final /*synthesized*/ fun component2(): kotlin.Double + internal final /*synthesized*/ fun copy(/*0*/ x: kotlin.String = ..., /*1*/ y: kotlin.Int, /*2*/ z: kotlin.Double = ...): test.DataClass } diff --git a/compiler/testData/loadJava/compiledKotlin/dataClass/NoComponents.txt b/compiler/testData/loadJava/compiledKotlin/dataClass/NoComponents.txt index 0bac6cd6861..fb57595944c 100644 --- a/compiler/testData/loadJava/compiledKotlin/dataClass/NoComponents.txt +++ b/compiler/testData/loadJava/compiledKotlin/dataClass/NoComponents.txt @@ -1,5 +1,5 @@ package test -jet.data() internal final class DataClass { +kotlin.data() internal final class DataClass { /*primary*/ public constructor DataClass() } diff --git a/compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.txt b/compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.txt index db27eadd284..5c36cf86d10 100644 --- a/compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.txt +++ b/compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.txt @@ -1,9 +1,9 @@ package test -jet.data() internal final class DataClass { - /*primary*/ public constructor DataClass(/*0*/ x: jet.String) - internal final val x: jet.String - internal final fun (): jet.String - internal final /*synthesized*/ fun component1(): jet.String - internal final /*synthesized*/ fun copy(/*0*/ x: jet.String = ...): test.DataClass +kotlin.data() internal final class DataClass { + /*primary*/ public constructor DataClass(/*0*/ x: kotlin.String) + internal final val x: kotlin.String + internal final fun (): kotlin.String + internal final /*synthesized*/ fun component1(): kotlin.String + internal final /*synthesized*/ fun copy(/*0*/ x: kotlin.String = ...): test.DataClass } diff --git a/compiler/testData/loadJava/compiledKotlin/dataClass/OpenDataClass.txt b/compiler/testData/loadJava/compiledKotlin/dataClass/OpenDataClass.txt index b1d7e8b7b2f..6779a04b780 100644 --- a/compiler/testData/loadJava/compiledKotlin/dataClass/OpenDataClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/dataClass/OpenDataClass.txt @@ -1,9 +1,9 @@ package test -jet.data() internal open class DataClass { - /*primary*/ public constructor DataClass(/*0*/ x: jet.String) - internal final val x: jet.String - internal final fun (): jet.String - internal final /*synthesized*/ fun component1(): jet.String - internal final /*synthesized*/ fun copy(/*0*/ x: jet.String = ...): test.DataClass +kotlin.data() internal open class DataClass { + /*primary*/ public constructor DataClass(/*0*/ x: kotlin.String) + internal final val x: kotlin.String + internal final fun (): kotlin.String + internal final /*synthesized*/ fun component1(): kotlin.String + internal final /*synthesized*/ fun copy(/*0*/ x: kotlin.String = ...): test.DataClass } diff --git a/compiler/testData/loadJava/compiledKotlin/dataClass/OpenPropertyFinalComponent.txt b/compiler/testData/loadJava/compiledKotlin/dataClass/OpenPropertyFinalComponent.txt index 0e1492c753d..fbeb8127950 100644 --- a/compiler/testData/loadJava/compiledKotlin/dataClass/OpenPropertyFinalComponent.txt +++ b/compiler/testData/loadJava/compiledKotlin/dataClass/OpenPropertyFinalComponent.txt @@ -1,9 +1,9 @@ package test -jet.data() internal open class DataClass { - /*primary*/ public constructor DataClass(/*0*/ x: jet.String) - internal open val x: jet.String - internal open fun (): jet.String - internal final /*synthesized*/ fun component1(): jet.String - internal final /*synthesized*/ fun copy(/*0*/ x: jet.String = ...): test.DataClass +kotlin.data() internal open class DataClass { + /*primary*/ public constructor DataClass(/*0*/ x: kotlin.String) + internal open val x: kotlin.String + internal open fun (): kotlin.String + internal final /*synthesized*/ fun component1(): kotlin.String + internal final /*synthesized*/ fun copy(/*0*/ x: kotlin.String = ...): test.DataClass } diff --git a/compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.txt b/compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.txt index 90c62036208..246252f70d6 100644 --- a/compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.txt +++ b/compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.txt @@ -1,12 +1,12 @@ package test -jet.data() internal final class DataClass { - /*primary*/ public constructor DataClass(/*0*/ x: jet.String, /*1*/ y: jet.Int) - internal final val x: jet.String - internal final fun (): jet.String - internal final val y: jet.Int - internal final fun (): jet.Int - internal final /*synthesized*/ fun component1(): jet.String - internal final /*synthesized*/ fun component2(): jet.Int - internal final /*synthesized*/ fun copy(/*0*/ x: jet.String = ..., /*1*/ y: jet.Int = ...): test.DataClass +kotlin.data() internal final class DataClass { + /*primary*/ public constructor DataClass(/*0*/ x: kotlin.String, /*1*/ y: kotlin.Int) + internal final val x: kotlin.String + internal final fun (): kotlin.String + internal final val y: kotlin.Int + internal final fun (): kotlin.Int + internal final /*synthesized*/ fun component1(): kotlin.String + internal final /*synthesized*/ fun component2(): kotlin.Int + internal final /*synthesized*/ fun copy(/*0*/ x: kotlin.String = ..., /*1*/ y: kotlin.Int = ...): test.DataClass } diff --git a/compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.txt b/compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.txt index 04f749133b2..f3dfb52d4e3 100644 --- a/compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.txt +++ b/compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.txt @@ -1,14 +1,14 @@ package test -jet.data() internal final class DataClass { - /*primary*/ public constructor DataClass(/*0*/ x: jet.String, /*1*/ y: jet.Int) - internal final var x: jet.String - internal final fun (): jet.String - internal final fun (/*0*/ : jet.String): jet.Unit - internal final var y: jet.Int - internal final fun (): jet.Int - internal final fun (/*0*/ : jet.Int): jet.Unit - internal final /*synthesized*/ fun component1(): jet.String - internal final /*synthesized*/ fun component2(): jet.Int - internal final /*synthesized*/ fun copy(/*0*/ x: jet.String = ..., /*1*/ y: jet.Int = ...): test.DataClass +kotlin.data() internal final class DataClass { + /*primary*/ public constructor DataClass(/*0*/ x: kotlin.String, /*1*/ y: kotlin.Int) + internal final var x: kotlin.String + internal final fun (): kotlin.String + internal final fun (/*0*/ : kotlin.String): kotlin.Unit + internal final var y: kotlin.Int + internal final fun (): kotlin.Int + internal final fun (/*0*/ : kotlin.Int): kotlin.Unit + internal final /*synthesized*/ fun component1(): kotlin.String + internal final /*synthesized*/ fun component2(): kotlin.Int + internal final /*synthesized*/ fun copy(/*0*/ x: kotlin.String = ..., /*1*/ y: kotlin.Int = ...): test.DataClass } diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt b/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt index 566e718acb8..05aebaf7239 100644 --- a/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt +++ b/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt @@ -1,73 +1,73 @@ package test -internal final enum class In : jet.Enum { +internal final enum class In : kotlin.Enum { /*primary*/ private constructor In() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object { /*primary*/ private constructor () - public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.In - public final /*synthesized*/ fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.In + public final /*synthesized*/ fun values(): kotlin.Array } public enum entry A : test.In { /*primary*/ private constructor A() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object : test.In.A { /*primary*/ private constructor () - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int } } } -private final enum class Pr : jet.Enum { +private final enum class Pr : kotlin.Enum { /*primary*/ private constructor Pr() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object { /*primary*/ private constructor () - public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.Pr - public final /*synthesized*/ fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Pr + public final /*synthesized*/ fun values(): kotlin.Array } public enum entry A : test.Pr { /*primary*/ private constructor A() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object : test.Pr.A { /*primary*/ private constructor () - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int } } } -public final enum class Pu : jet.Enum { +public final enum class Pu : kotlin.Enum { /*primary*/ private constructor Pu() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object { /*primary*/ private constructor () - public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.Pu - public final /*synthesized*/ fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Pu + public final /*synthesized*/ fun values(): kotlin.Array } public enum entry A : test.Pu { /*primary*/ private constructor A() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object : test.Pu.A { /*primary*/ private constructor () - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int } } } diff --git a/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt b/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt index 19fd6e11d6b..09669954b77 100644 --- a/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt +++ b/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt @@ -3,26 +3,26 @@ package test internal final class A { /*primary*/ public constructor A() - internal final enum class E : jet.Enum { + internal final enum class E : kotlin.Enum { /*primary*/ private constructor E() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object { /*primary*/ private constructor () - public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.A.E - public final /*synthesized*/ fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.A.E + public final /*synthesized*/ fun values(): kotlin.Array } public enum entry ENTRY : test.A.E { /*primary*/ private constructor ENTRY() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object : test.A.E.ENTRY { /*primary*/ private constructor () - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int } } } diff --git a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt b/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt index 39180940703..e4437ea18d3 100644 --- a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt @@ -7,26 +7,26 @@ internal final class A { /*primary*/ private constructor () } - internal final enum class E : jet.Enum { + internal final enum class E : kotlin.Enum { /*primary*/ private constructor E() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object { /*primary*/ private constructor () - public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.A.E - public final /*synthesized*/ fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.A.E + public final /*synthesized*/ fun values(): kotlin.Array } public enum entry ENTRY : test.A.E { /*primary*/ private constructor ENTRY() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object : test.A.E.ENTRY { /*primary*/ private constructor () - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int } } } diff --git a/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt b/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt index ae20e2aff41..c18c24ef4d7 100644 --- a/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt +++ b/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt @@ -1,25 +1,25 @@ package test -internal final enum class MyEnum : jet.Enum { +internal final enum class MyEnum : kotlin.Enum { /*primary*/ private constructor MyEnum() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object { /*primary*/ private constructor () - public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.MyEnum - public final /*synthesized*/ fun values(): jet.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.MyEnum + public final /*synthesized*/ fun values(): kotlin.Array } public enum entry ENTRY : test.MyEnum { /*primary*/ private constructor ENTRY() - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public class object : test.MyEnum.ENTRY { /*primary*/ private constructor () - public final override /*1*/ /*fake_override*/ fun name(): jet.String - public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int + public final override /*1*/ /*fake_override*/ fun name(): kotlin.String + public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int } } } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.txt b/compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.txt index be27869d466..25a1e513f53 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.txt @@ -4,13 +4,13 @@ internal final class B : test.X, test.Y { /*primary*/ public constructor B(/*0*/ a: test.X) internal final val a: test.X internal final fun (): test.X - internal open override /*2*/ fun foo(): jet.Unit + internal open override /*2*/ fun foo(): kotlin.Unit } internal trait X { - internal abstract fun foo(): jet.Unit + internal abstract fun foo(): kotlin.Unit } internal trait Y : test.X { - internal abstract override /*1*/ /*fake_override*/ fun foo(): jet.Unit + internal abstract override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.txt b/compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.txt index d5ce427d1c6..64d8cb090bb 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.txt @@ -1,16 +1,16 @@ package test public trait Sub : test.Super1, test.Super2 { - public abstract override /*1*/ /*fake_override*/ fun bar(): jet.CharSequence - public abstract override /*1*/ /*fake_override*/ fun foo(): jet.CharSequence + public abstract override /*1*/ /*fake_override*/ fun bar(): kotlin.CharSequence + public abstract override /*1*/ /*fake_override*/ fun foo(): kotlin.CharSequence } public trait Super1 { - private abstract fun bar(): jet.String - public abstract fun foo(): jet.CharSequence + private abstract fun bar(): kotlin.String + public abstract fun foo(): kotlin.CharSequence } public trait Super2 { - public abstract fun bar(): jet.CharSequence - private abstract fun foo(): jet.String + public abstract fun bar(): kotlin.CharSequence + private abstract fun foo(): kotlin.String } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.txt b/compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.txt index 917b4b8cd2e..2c842d6a730 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.txt @@ -1,26 +1,26 @@ package test public trait Sub : test.Super1, test.Super2 { - internal abstract override /*2*/ /*fake_override*/ var x: jet.String - internal abstract override /*2*/ /*fake_override*/ fun (): jet.String - internal abstract override /*1*/ /*fake_override*/ fun (/*0*/ : jet.String): jet.Unit - internal abstract override /*2*/ /*fake_override*/ var y: jet.String - internal abstract override /*2*/ /*fake_override*/ fun (): jet.String - internal abstract override /*1*/ /*fake_override*/ fun (/*0*/ : jet.String): jet.Unit + internal abstract override /*2*/ /*fake_override*/ var x: kotlin.String + internal abstract override /*2*/ /*fake_override*/ fun (): kotlin.String + internal abstract override /*1*/ /*fake_override*/ fun (/*0*/ : kotlin.String): kotlin.Unit + internal abstract override /*2*/ /*fake_override*/ var y: kotlin.String + internal abstract override /*2*/ /*fake_override*/ fun (): kotlin.String + internal abstract override /*1*/ /*fake_override*/ fun (/*0*/ : kotlin.String): kotlin.Unit } public trait Super1 { - internal abstract val x: jet.String - internal abstract fun (): jet.String - internal abstract var y: jet.String - internal abstract fun (): jet.String - internal abstract fun (/*0*/ : jet.String): jet.Unit + internal abstract val x: kotlin.String + internal abstract fun (): kotlin.String + internal abstract var y: kotlin.String + internal abstract fun (): kotlin.String + internal abstract fun (/*0*/ : kotlin.String): kotlin.Unit } public trait Super2 { - internal abstract var x: jet.String - internal abstract fun (): jet.String - internal abstract fun (/*0*/ : jet.String): jet.Unit - internal abstract val y: jet.String - internal abstract fun (): jet.String + internal abstract var x: kotlin.String + internal abstract fun (): kotlin.String + internal abstract fun (/*0*/ : kotlin.String): kotlin.Unit + internal abstract val y: kotlin.String + internal abstract fun (): kotlin.String } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.txt b/compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.txt index 40caba49eba..b86d8b46863 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.txt @@ -1,22 +1,22 @@ package test public trait Sub : test.Super1, test.Super2 { - internal abstract override /*2*/ /*fake_override*/ val x: jet.String - internal abstract override /*2*/ /*fake_override*/ fun (): jet.String - internal abstract override /*2*/ /*fake_override*/ val y: jet.String - internal abstract override /*2*/ /*fake_override*/ fun (): jet.String + internal abstract override /*2*/ /*fake_override*/ val x: kotlin.String + internal abstract override /*2*/ /*fake_override*/ fun (): kotlin.String + internal abstract override /*2*/ /*fake_override*/ val y: kotlin.String + internal abstract override /*2*/ /*fake_override*/ fun (): kotlin.String } public trait Super1 { - internal abstract val x: jet.String - internal abstract fun (): jet.String - internal abstract val y: jet.CharSequence - internal abstract fun (): jet.CharSequence + internal abstract val x: kotlin.String + internal abstract fun (): kotlin.String + internal abstract val y: kotlin.CharSequence + internal abstract fun (): kotlin.CharSequence } public trait Super2 { - internal abstract val x: jet.CharSequence - internal abstract fun (): jet.CharSequence - internal abstract val y: jet.String - internal abstract fun (): jet.String + internal abstract val x: kotlin.CharSequence + internal abstract fun (): kotlin.CharSequence + internal abstract val y: kotlin.String + internal abstract fun (): kotlin.String } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/NoDelegationForFunctionInheritedFromTraitSuperClass.txt b/compiler/testData/loadJava/compiledKotlin/fun/NoDelegationForFunctionInheritedFromTraitSuperClass.txt index 0b9157d14e3..42b3314eb6c 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/NoDelegationForFunctionInheritedFromTraitSuperClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/NoDelegationForFunctionInheritedFromTraitSuperClass.txt @@ -2,29 +2,29 @@ package test internal abstract class A { /*primary*/ public constructor A() - internal abstract fun foo(): jet.Unit + internal abstract fun foo(): kotlin.Unit } internal open class B : test.A { /*primary*/ public constructor B() - internal open override /*1*/ fun foo(): jet.Unit + internal open override /*1*/ fun foo(): kotlin.Unit } internal final class C : test.A, test.X { /*primary*/ public constructor C() - internal open override /*1*/ /*fake_override*/ fun bar(): jet.Unit - internal open override /*2*/ fun foo(): jet.Unit + internal open override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit + internal open override /*2*/ fun foo(): kotlin.Unit } internal final class D : test.B, test.X { /*primary*/ public constructor D(/*0*/ c: test.C) internal final val c: test.C internal final fun (): test.C - internal open override /*1*/ /*delegation*/ fun bar(): jet.Unit - internal open override /*2*/ /*fake_override*/ fun foo(): jet.Unit + internal open override /*1*/ /*delegation*/ fun bar(): kotlin.Unit + internal open override /*2*/ /*fake_override*/ fun foo(): kotlin.Unit } internal trait X : test.A { - internal open fun bar(): jet.Unit - internal abstract override /*1*/ /*fake_override*/ fun foo(): jet.Unit + internal open fun bar(): kotlin.Unit + internal abstract override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.txt b/compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.txt index 311635dec88..a5d9d50c48c 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.txt @@ -1,7 +1,7 @@ package test -internal fun foo(/*0*/ r: java.lang.Runnable): jet.Unit +internal fun foo(/*0*/ r: java.lang.Runnable): kotlin.Unit public trait TaskObject { - internal abstract fun foo(/*0*/ r: java.lang.Runnable): jet.Unit + internal abstract fun foo(/*0*/ r: java.lang.Runnable): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.txt b/compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.txt index 8afb2805767..f2ec3caae9f 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.txt @@ -1,5 +1,5 @@ package test public trait Runnable { - internal abstract fun run(): jet.Unit + internal abstract fun run(): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.txt b/compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.txt index 1696a07bb36..2b4f66ed8ad 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.txt @@ -1,18 +1,18 @@ package test internal trait A { - internal open fun bar(): jet.Unit - internal open fun foo(): jet.Unit + internal open fun bar(): kotlin.Unit + internal open fun foo(): kotlin.Unit } internal open class B : test.A { /*primary*/ public constructor B() - internal open override /*1*/ /*fake_override*/ fun bar(): jet.Unit - internal open override /*1*/ /*fake_override*/ fun foo(): jet.Unit + internal open override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit + internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit } internal final class C : test.B { /*primary*/ public constructor C() - internal open override /*1*/ fun bar(): jet.Unit - internal open override /*1*/ /*fake_override*/ fun foo(): jet.Unit + internal open override /*1*/ fun bar(): kotlin.Unit + internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.txt b/compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.txt index e6f4e7aa4c3..e15f3cef1b6 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.txt @@ -1,6 +1,6 @@ package test -internal final class PropagateSubclassOfComparable : jet.Comparable { +internal final class PropagateSubclassOfComparable : kotlin.Comparable { /*primary*/ public constructor PropagateSubclassOfComparable() - public open override /*1*/ fun compareTo(/*0*/ other: test.PropagateSubclassOfComparable): jet.Int + public open override /*1*/ fun compareTo(/*0*/ other: test.PropagateSubclassOfComparable): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.txt index 432fc4798b0..4d86aa5ea70 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.txt @@ -1,3 +1,3 @@ package test -internal fun f(): jet.Int +internal fun f(): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.txt index cd286dacb45..ac501699b45 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.txt @@ -1,3 +1,3 @@ package test -internal fun funParamParam(/*0*/ a: jet.Int, /*1*/ b: P): jet.Int +internal fun funParamParam(/*0*/ a: kotlin.Int, /*1*/ b: P): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt index cd286dacb45..ac501699b45 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt @@ -1,3 +1,3 @@ package test -internal fun funParamParam(/*0*/ a: jet.Int, /*1*/ b: P): jet.Int +internal fun funParamParam(/*0*/ a: kotlin.Int, /*1*/ b: P): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt index e20057d6da9..39a45262b09 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt @@ -1,3 +1,3 @@ package test -internal fun funParamReferencesParam(): jet.Int +internal fun funParamReferencesParam(): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt index c22e29c585e..2dfbdd2ae87 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt @@ -1,6 +1,6 @@ package test -internal fun foo(): jet.Unit where T : test.Bar +internal fun foo(): kotlin.Unit where T : test.Bar internal trait Bar { } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt index 6e7e6374406..7f399b2ba2b 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt @@ -1,3 +1,3 @@ package test -internal fun uno(): jet.Int +internal fun uno(): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt index 0df5fa99749..a0308b5f268 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt @@ -1,3 +1,3 @@ package test -internal fun tres(): jet.Int where A : java.io.Serializable +internal fun tres(): kotlin.Int where A : java.io.Serializable diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt index 75732c5625b..50863063676 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt @@ -1,3 +1,3 @@ package test -internal fun dos(): jet.Int +internal fun dos(): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt index 01f4ba380d4..bb47d16b9aa 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt @@ -1,3 +1,3 @@ package test -internal fun funParamVarargParam(/*0*/ a: jet.Int, /*1*/ vararg b: P /*jet.Array

*/): jet.Int +internal fun funParamVarargParam(/*0*/ a: kotlin.Int, /*1*/ vararg b: P /*kotlin.Array

*/): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt index bb2b0de7889..366e1ba69ef 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt @@ -1,3 +1,3 @@ package test -internal fun funTwoTypeParams(): jet.Int +internal fun funTwoTypeParams(): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt index 79b30ddf648..e3b13c927a5 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt @@ -1,3 +1,3 @@ package test -internal fun ff(/*0*/ p: jet.List): jet.Int +internal fun ff(/*0*/ p: kotlin.List): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt index 710c725ffd4..f9079aaa540 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt @@ -1,3 +1,3 @@ package test -internal fun ff(/*0*/ p: jet.List): jet.Int +internal fun ff(/*0*/ p: kotlin.List): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt index 57f853ad916..25a19fd3b9f 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt @@ -1,3 +1,3 @@ package test -internal fun fff(/*0*/ a: java.lang.Integer?): jet.Int +internal fun fff(/*0*/ a: java.lang.Integer?): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt index ebd46b1b042..8a2f933f833 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt @@ -1,3 +1,3 @@ package test -internal fun ffgg(): jet.List +internal fun ffgg(): kotlin.List diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt index cbd51ce4aef..7a63c5814c4 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt @@ -1,3 +1,3 @@ package test -internal fun ffgg(): jet.List +internal fun ffgg(): kotlin.List diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.txt index b2d6cc94bae..d913d50c904 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.txt @@ -2,5 +2,5 @@ package test internal final class River { /*primary*/ public constructor River() - internal final fun song(): jet.Int + internal final fun song(): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.txt index 38d32cac57e..1b1962366b8 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.txt @@ -2,5 +2,5 @@ package test internal final class ClassFunGetFoo { /*primary*/ public constructor ClassFunGetFoo() - internal final fun getFoo(): jet.Int + internal final fun getFoo(): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt index 9081a83040c..82cb6e80e96 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt @@ -2,6 +2,6 @@ package test internal final class ClassFunGetFoo { /*primary*/ public constructor ClassFunGetFoo() - internal final fun getFoo(): jet.Int - internal final fun setFoo(/*0*/ p: jet.Int): jet.Unit + internal final fun getFoo(): kotlin.Int + internal final fun setFoo(/*0*/ p: kotlin.Int): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.txt index fc68ef166bd..6a3f0415569 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.txt @@ -2,5 +2,5 @@ package test internal final class ClassFunGetFoo { /*primary*/ public constructor ClassFunGetFoo() - internal final fun set(/*0*/ p: jet.Int): jet.Unit + internal final fun set(/*0*/ p: kotlin.Int): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.txt index 3b5c7aad9af..45960935ffc 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.txt @@ -1,3 +1,3 @@ package test -internal fun jet.Int.shuffle(): jet.Int +internal fun kotlin.Int.shuffle(): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.txt index 89d06d3975b..836122a8e40 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.txt @@ -2,5 +2,5 @@ package test internal final class ExtFunInClass { /*primary*/ public constructor ExtFunInClass() - internal final fun jet.Int.shuffle(): jet.Int + internal final fun kotlin.Int.shuffle(): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.txt index d31219f8588..bde1b71205a 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.txt @@ -1,3 +1,3 @@ package test -internal fun funDefaultArg(/*0*/ p: jet.Int, /*1*/ q: jet.Int = ..., /*2*/ r: jet.Int = ...): jet.Int +internal fun funDefaultArg(/*0*/ p: kotlin.Int, /*1*/ q: kotlin.Int = ..., /*2*/ r: kotlin.Int = ...): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.txt index 1657982957c..75f7b7cdbe3 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.txt @@ -1,3 +1,3 @@ package test -internal fun fff(/*0*/ a: java.lang.Integer): jet.Int +internal fun fff(/*0*/ a: java.lang.Integer): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.txt index c459bce3f4e..30a58087083 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.txt @@ -1,3 +1,3 @@ package test -internal fun varargInt(/*0*/ a: jet.Int, /*1*/ vararg b: jet.Int /*jet.IntArray*/): jet.Int +internal fun varargInt(/*0*/ a: kotlin.Int, /*1*/ vararg b: kotlin.Int /*kotlin.IntArray*/): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.txt index 828ed9f18d7..ec5e328e07d 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.txt @@ -1,3 +1,3 @@ package test -internal fun varargCharSequence(/*0*/ a: jet.Int, /*1*/ vararg b: java.lang.Integer /*jet.Array*/): jet.Int +internal fun varargCharSequence(/*0*/ a: kotlin.Int, /*1*/ vararg b: java.lang.Integer /*kotlin.Array*/): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.txt index ae5d28aab38..8b4d743583d 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.txt @@ -2,5 +2,5 @@ package test internal abstract class ModifierAbstract { /*primary*/ public constructor ModifierAbstract() - internal abstract fun abs(): jet.Int + internal abstract fun abs(): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.txt index 5bf0414ea7a..b4302e0e003 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.txt @@ -2,5 +2,5 @@ package test internal open class ModifierOpen { /*primary*/ public constructor ModifierOpen() - internal open fun abs(): jet.Int + internal open fun abs(): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.txt index bdeccbc568a..e4ceb88bd99 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.txt @@ -1,3 +1,3 @@ package test -internal fun f(): jet.Int +internal fun f(): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.txt index 418855c4f19..3db880abad5 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.txt @@ -1,3 +1,3 @@ package test -internal fun getFoo(): jet.Int +internal fun getFoo(): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.txt b/compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.txt index 350b12edb3f..9e2f0fc05fb 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.txt @@ -1,4 +1,4 @@ package test -internal fun f(/*0*/ vararg t: jet.String /*jet.Array*/, /*1*/ f: () -> jet.Unit): jet.Unit -internal fun f(/*0*/ vararg t: jet.Int /*jet.IntArray*/, /*1*/ f: () -> jet.Unit): jet.Unit +internal fun f(/*0*/ vararg t: kotlin.String /*kotlin.Array*/, /*1*/ f: () -> kotlin.Unit): kotlin.Unit +internal fun f(/*0*/ vararg t: kotlin.Int /*kotlin.IntArray*/, /*1*/ f: () -> kotlin.Unit): kotlin.Unit diff --git a/compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.txt b/compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.txt index 0a8407593ec..f07716589a7 100644 --- a/compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.txt +++ b/compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.txt @@ -1,6 +1,6 @@ package test -jet.inline() internal fun a(): jet.Unit -jet.inline(strategy = InlineStrategy.AS_FUNCTION: jet.InlineStrategy) internal fun b(): jet.Unit -jet.inline(strategy = InlineStrategy.IN_PLACE: jet.InlineStrategy) internal fun c(): jet.Unit -jet.inline(strategy = InlineStrategy.IN_PLACE: jet.InlineStrategy) internal fun d(): jet.Unit +kotlin.inline() internal fun a(): kotlin.Unit +kotlin.inline(strategy = InlineStrategy.AS_FUNCTION: kotlin.InlineStrategy) internal fun b(): kotlin.Unit +kotlin.inline(strategy = InlineStrategy.IN_PLACE: kotlin.InlineStrategy) internal fun c(): kotlin.Unit +kotlin.inline(strategy = InlineStrategy.IN_PLACE: kotlin.InlineStrategy) internal fun d(): kotlin.Unit diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ClassVal.txt b/compiler/testData/loadJava/compiledKotlin/prop/ClassVal.txt index 030986366c1..3c3e19d1303 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ClassVal.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ClassVal.txt @@ -2,6 +2,6 @@ package test internal final class ClassVal { /*primary*/ public constructor ClassVal() - internal final val aa: jet.Int - internal final fun (): jet.Int + internal final val aa: kotlin.Int + internal final fun (): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.txt b/compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.txt index 9577d5ec383..eb90abcd77d 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.txt @@ -2,6 +2,6 @@ package test internal abstract class ClassValAbstract { /*primary*/ public constructor ClassValAbstract() - internal abstract val a: jet.Int - internal abstract fun (): jet.Int + internal abstract val a: kotlin.Int + internal abstract fun (): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ClassVar.txt b/compiler/testData/loadJava/compiledKotlin/prop/ClassVar.txt index f7b066847cd..628ae080cdc 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ClassVar.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ClassVar.txt @@ -2,7 +2,7 @@ package test internal final class ClassVar { /*primary*/ public constructor ClassVar() - internal final var aa: jet.Int - internal final fun (): jet.Int - internal final fun (/*0*/ : jet.Int): jet.Unit + internal final var aa: kotlin.Int + internal final fun (): kotlin.Int + internal final fun (/*0*/ : kotlin.Int): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.txt b/compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.txt index 78c4b627116..c6545452b46 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.txt @@ -1,4 +1,4 @@ package test -internal val jet.Collection.anotherSize: jet.Int - internal fun jet.Collection.(): jet.Int +internal val kotlin.Collection.anotherSize: kotlin.Int + internal fun kotlin.Collection.(): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.txt index dd15264f755..64c40cfec19 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.txt @@ -2,6 +2,6 @@ package test internal final class ExtPropInClass { /*primary*/ public constructor ExtPropInClass() - internal final val jet.Int.itIs: jet.Int - internal final fun jet.Int.(): jet.Int + internal final val kotlin.Int.itIs: kotlin.Int + internal final fun kotlin.Int.(): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.txt index 4a55a000fd2..ecca82ab3d9 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.txt @@ -1,4 +1,4 @@ package test -internal val jet.Int.itIs: jet.Int - internal fun jet.Int.(): jet.Int +internal val kotlin.Int.itIs: kotlin.Int + internal fun kotlin.Int.(): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.txt index 7c43f040aa2..8b6a4eda1ed 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.txt @@ -1,4 +1,4 @@ package test -internal val jet.Int.ggg: java.lang.CharSequence - internal fun jet.Int.(): java.lang.CharSequence +internal val kotlin.Int.ggg: java.lang.CharSequence + internal fun kotlin.Int.(): java.lang.CharSequence diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.txt index ce50c8ce851..b104e2cc8b6 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.txt @@ -1,4 +1,4 @@ package test -internal val jet.Int.ggg: java.lang.CharSequence? - internal fun jet.Int.(): java.lang.CharSequence? +internal val kotlin.Int.ggg: java.lang.CharSequence? + internal fun kotlin.Int.(): java.lang.CharSequence? diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.txt index cec63d501a4..361931c2a9d 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.txt @@ -2,6 +2,6 @@ package test internal final class ExtValInClass { /*primary*/ public constructor ExtValInClass() - internal final val jet.Int.asas: java.util.List? - internal final fun jet.Int.(): java.util.List? + internal final val kotlin.Int.asas: java.util.List? + internal final fun kotlin.Int.(): java.util.List? } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.txt index ea49600ae72..f4cca5d2636 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.txt @@ -2,6 +2,6 @@ package test internal final class ExtValInClass { /*primary*/ public constructor ExtValInClass() - internal final val jet.Int.asas: T - internal final fun jet.Int.(): T + internal final val kotlin.Int.asas: T + internal final fun kotlin.Int.(): T } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.txt index 0ccbfbfe5bd..4fa5bd72577 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.txt @@ -2,6 +2,6 @@ package test internal final class ExtValInClass { /*primary*/ public constructor ExtValInClass() - internal final val jet.Int.asas: P? - internal final fun jet.Int.(): P? + internal final val kotlin.Int.asas: P? + internal final fun kotlin.Int.(): P? } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.txt index 5fb851cc9ea..30429d4c025 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.txt @@ -2,6 +2,6 @@ package test internal final class ExtValPIntInClass { /*primary*/ public constructor ExtValPIntInClass() - internal final val P.asas: jet.Int - internal final fun P.(): jet.Int + internal final val P.asas: kotlin.Int + internal final fun P.(): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.txt index 52be10bfc7d..3a49616ed9e 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.txt @@ -2,4 +2,4 @@ package test internal var P.anotherJavaClass: java.lang.Class

internal fun P.(): java.lang.Class

- internal fun P.(/*0*/ p: java.lang.Class

): jet.Unit + internal fun P.(/*0*/ p: java.lang.Class

): kotlin.Unit diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.txt index 1449683b3d7..edd45f28031 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.txt @@ -2,7 +2,7 @@ package test internal final class ExtPropInClass { /*primary*/ public constructor ExtPropInClass() - internal final var jet.Int.itIs: jet.Int - internal final fun jet.Int.(): jet.Int - internal final fun jet.Int.(/*0*/ p: jet.Int): jet.Unit + internal final var kotlin.Int.itIs: kotlin.Int + internal final fun kotlin.Int.(): kotlin.Int + internal final fun kotlin.Int.(/*0*/ p: kotlin.Int): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.txt index 0892daa7101..d471506fbb0 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.txt @@ -1,5 +1,5 @@ package test -internal var jet.Int.ggg: jet.Int - internal fun jet.Int.(): jet.Int - internal fun jet.Int.(/*0*/ p: jet.Int): jet.Unit +internal var kotlin.Int.ggg: kotlin.Int + internal fun kotlin.Int.(): kotlin.Int + internal fun kotlin.Int.(/*0*/ p: kotlin.Int): kotlin.Unit diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.txt index cb419d12086..d937676475c 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.txt @@ -2,7 +2,7 @@ package test internal final class ExtValInClass { /*primary*/ public constructor ExtValInClass() - internal final var jet.Int.asas: P - internal final fun jet.Int.(): P - internal final fun jet.Int.(/*0*/ p: P): jet.Unit + internal final var kotlin.Int.asas: P + internal final fun kotlin.Int.(): P + internal final fun kotlin.Int.(/*0*/ p: P): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.txt index cd37a2d59b6..dd84394d598 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.txt @@ -2,7 +2,7 @@ package test internal final class ExtValInClass { /*primary*/ public constructor ExtValInClass() - internal final var jet.Int.asas: P? - internal final fun jet.Int.(): P? - internal final fun jet.Int.(/*0*/ p: P?): jet.Unit + internal final var kotlin.Int.asas: P? + internal final fun kotlin.Int.(): P? + internal final fun kotlin.Int.(/*0*/ p: P?): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.txt index 7d6f9b7a800..656d6c8d09d 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.txt @@ -1,5 +1,5 @@ package test -internal var jet.Map.asas: jet.Int - internal fun jet.Map.(): jet.Int - internal fun jet.Map.(/*0*/ i: jet.Int): jet.Unit +internal var kotlin.Map.asas: kotlin.Int + internal fun kotlin.Map.(): kotlin.Int + internal fun kotlin.Map.(/*0*/ i: kotlin.Int): kotlin.Unit diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.txt index 603e6bfe149..91a0fe45ff2 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.txt @@ -2,7 +2,7 @@ package test internal final class ExtValPIntInClass { /*primary*/ public constructor ExtValPIntInClass() - internal final var P.asas: jet.Int - internal final fun P.(): jet.Int - internal final fun P.(/*0*/ p: jet.Int): jet.Unit + internal final var P.asas: kotlin.Int + internal final fun P.(): kotlin.Int + internal final fun P.(/*0*/ p: kotlin.Int): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.txt index 170c73314a7..cf72a56e9a1 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.txt @@ -2,7 +2,7 @@ package test internal final class ExtValPIntInClass { /*primary*/ public constructor ExtValPIntInClass() - internal final var P?.asas: jet.Int - internal final fun P?.(): jet.Int - internal final fun P?.(/*0*/ p: jet.Int): jet.Unit + internal final var P?.asas: kotlin.Int + internal final fun P?.(): kotlin.Int + internal final fun P?.(/*0*/ p: kotlin.Int): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.txt index 0f70620dcde..fdbe19b8e96 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.txt @@ -1,7 +1,7 @@ package test -internal var jet.Int.junk: jet.Short - internal fun jet.Int.(): jet.Short - internal fun jet.Int.(/*0*/ p: jet.Short): jet.Unit -internal val jet.String.junk: jet.Int - internal fun jet.String.(): jet.Int +internal var kotlin.Int.junk: kotlin.Short + internal fun kotlin.Int.(): kotlin.Short + internal fun kotlin.Int.(/*0*/ p: kotlin.Short): kotlin.Unit +internal val kotlin.String.junk: kotlin.Int + internal fun kotlin.String.(): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/prop/NsVal.txt b/compiler/testData/loadJava/compiledKotlin/prop/NsVal.txt index 5ae5465c6d2..9717afe5944 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/NsVal.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/NsVal.txt @@ -1,4 +1,4 @@ package test -internal val nsVal: jet.Int - internal fun (): jet.Int +internal val nsVal: kotlin.Int + internal fun (): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/prop/NsVar.txt b/compiler/testData/loadJava/compiledKotlin/prop/NsVar.txt index 27cb51d956f..4ea7cb6f0aa 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/NsVar.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/NsVar.txt @@ -1,5 +1,5 @@ package test -internal var nsVal: jet.Int - internal fun (): jet.Int - internal fun (/*0*/ : jet.Int): jet.Unit +internal var nsVal: kotlin.Int + internal fun (): kotlin.Int + internal fun (/*0*/ : kotlin.Int): kotlin.Unit diff --git a/compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.txt b/compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.txt index 7680181b109..caa411189c5 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.txt @@ -2,12 +2,12 @@ package test internal open class BaseClass { /*primary*/ public constructor BaseClass() - internal open val shape: jet.String - internal open fun (): jet.String + internal open val shape: kotlin.String + internal open fun (): kotlin.String } internal open class Subclass : test.BaseClass { /*primary*/ public constructor Subclass() - internal open override /*1*/ val shape: jet.String - internal open override /*1*/ fun (): jet.String + internal open override /*1*/ val shape: kotlin.String + internal open override /*1*/ fun (): kotlin.String } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.txt b/compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.txt index 20c09f49f0d..f4135441e93 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.txt @@ -2,11 +2,11 @@ package test internal open class Subclass : test.Trait { /*primary*/ public constructor Subclass() - internal open override /*1*/ val shape: jet.String - internal open override /*1*/ fun (): jet.String + internal open override /*1*/ val shape: kotlin.String + internal open override /*1*/ fun (): kotlin.String } internal trait Trait { - internal abstract val shape: jet.String - internal abstract fun (): jet.String + internal abstract val shape: kotlin.String + internal abstract fun (): kotlin.String } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.txt b/compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.txt index 889c5f35972..c013493f956 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.txt @@ -2,12 +2,12 @@ package test internal open class BaseClass { /*primary*/ public constructor BaseClass() - internal final val exactly: jet.Int - internal final fun (): jet.Int + internal final val exactly: kotlin.Int + internal final fun (): kotlin.Int } internal final class Subclass : test.BaseClass { /*primary*/ public constructor Subclass() - internal final override /*1*/ /*fake_override*/ val exactly: jet.Int - internal final override /*1*/ /*fake_override*/ fun (): jet.Int + internal final override /*1*/ /*fake_override*/ val exactly: kotlin.Int + internal final override /*1*/ /*fake_override*/ fun (): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.txt b/compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.txt index 2d97066c63c..7eccf9eb78a 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.txt @@ -1,7 +1,7 @@ package test internal trait A { - internal open var v: jet.String - internal open fun (): jet.String - internal open fun (/*0*/ value: jet.String): jet.Unit + internal open var v: kotlin.String + internal open fun (): kotlin.String + internal open fun (/*0*/ value: kotlin.String): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.txt b/compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.txt index 72220d27a2f..4075f61435f 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.txt @@ -1,6 +1,6 @@ package test internal trait A { - internal open val v: jet.String - internal open fun (): jet.String + internal open val v: kotlin.String + internal open fun (): kotlin.String } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.txt b/compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.txt index 9cb92ed45c5..488b06fa417 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.txt @@ -1,14 +1,14 @@ package test internal trait A { - internal open var v: jet.String - internal open fun (): jet.String - internal open fun (/*0*/ value: jet.String): jet.Unit + internal open var v: kotlin.String + internal open fun (): kotlin.String + internal open fun (/*0*/ value: kotlin.String): kotlin.Unit } internal final class B : test.A { /*primary*/ public constructor B() - internal open override /*1*/ /*fake_override*/ var v: jet.String - internal open override /*1*/ /*fake_override*/ fun (): jet.String - internal open override /*1*/ /*fake_override*/ fun (/*0*/ value: jet.String): jet.Unit + internal open override /*1*/ /*fake_override*/ var v: kotlin.String + internal open override /*1*/ /*fake_override*/ fun (): kotlin.String + internal open override /*1*/ /*fake_override*/ fun (/*0*/ value: kotlin.String): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.txt b/compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.txt index b6cf9cc5980..b30fdb2ca76 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.txt @@ -2,13 +2,13 @@ package test internal final class A { /*primary*/ public constructor A() - internal final var a: jet.Int - internal final fun (): jet.Int - internal final fun (/*0*/ : jet.Int): jet.Unit + internal final var a: kotlin.Int + internal final fun (): kotlin.Int + internal final fun (/*0*/ : kotlin.Int): kotlin.Unit } internal final class MyProperty { /*primary*/ public constructor MyProperty() - internal final fun get(/*0*/ t: T, /*1*/ p: jet.PropertyMetadata): jet.Int - internal final fun set(/*0*/ t: T, /*1*/ p: jet.PropertyMetadata, /*2*/ i: jet.Int): jet.Unit + internal final fun get(/*0*/ t: T, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int + internal final fun set(/*0*/ t: T, /*1*/ p: kotlin.PropertyMetadata, /*2*/ i: kotlin.Int): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.txt index b5d415fedcf..8b5644b368b 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.txt @@ -2,14 +2,14 @@ package test internal final class ClassVal { /*primary*/ public constructor ClassVal() - internal final val property1: jet.Int - internal final fun (): jet.Int - internal final val property2: jet.Int - internal final fun (): jet.Int + internal final val property1: kotlin.Int + internal final fun (): kotlin.Int + internal final val property2: kotlin.Int + internal final fun (): kotlin.Int private final val property3: java.lang.Object private final fun (): java.lang.Object - protected final val property4: jet.String - protected final fun (): jet.String - public final val property5: jet.Int - public final fun (): jet.Int + protected final val property4: kotlin.String + protected final fun (): kotlin.String + public final val property5: kotlin.Int + public final fun (): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.txt index f53b19cc932..abb0cd93dc6 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.txt @@ -1,15 +1,15 @@ package test internal final class ClassValParams { - /*primary*/ public constructor ClassValParams(/*0*/ pr1: jet.String, /*1*/ pr2: jet.Int, /*2*/ pr3: jet.Long, /*3*/ pr4: java.util.Date, /*4*/ pr5: jet.Any, /*5*/ pr6: java.lang.Object) - internal final val pr1: jet.String - internal final fun (): jet.String - internal final val pr2: jet.Int - internal final fun (): jet.Int - private final val pr3: jet.Long - private final fun (): jet.Long + /*primary*/ public constructor ClassValParams(/*0*/ pr1: kotlin.String, /*1*/ pr2: kotlin.Int, /*2*/ pr3: kotlin.Long, /*3*/ pr4: java.util.Date, /*4*/ pr5: kotlin.Any, /*5*/ pr6: java.lang.Object) + internal final val pr1: kotlin.String + internal final fun (): kotlin.String + internal final val pr2: kotlin.Int + internal final fun (): kotlin.Int + private final val pr3: kotlin.Long + private final fun (): kotlin.Long protected final val pr4: java.util.Date protected final fun (): java.util.Date - public final val pr5: jet.Any - public final fun (): jet.Any + public final val pr5: kotlin.Any + public final fun (): kotlin.Any } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.txt index b5d415fedcf..8b5644b368b 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.txt @@ -2,14 +2,14 @@ package test internal final class ClassVal { /*primary*/ public constructor ClassVal() - internal final val property1: jet.Int - internal final fun (): jet.Int - internal final val property2: jet.Int - internal final fun (): jet.Int + internal final val property1: kotlin.Int + internal final fun (): kotlin.Int + internal final val property2: kotlin.Int + internal final fun (): kotlin.Int private final val property3: java.lang.Object private final fun (): java.lang.Object - protected final val property4: jet.String - protected final fun (): jet.String - public final val property5: jet.Int - public final fun (): jet.Int + protected final val property4: kotlin.String + protected final fun (): kotlin.String + public final val property5: kotlin.Int + public final fun (): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.txt index 30b5e4a6e25..fffdf07a6b0 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.txt @@ -2,19 +2,19 @@ package test internal final class ClassVar { /*primary*/ public constructor ClassVar() - internal final var property1: jet.Int - internal final fun (): jet.Int - internal final fun (/*0*/ : jet.Int): jet.Unit - internal final var property2: jet.Int - internal final fun (): jet.Int - internal final fun (/*0*/ : jet.Int): jet.Unit + internal final var property1: kotlin.Int + internal final fun (): kotlin.Int + internal final fun (/*0*/ : kotlin.Int): kotlin.Unit + internal final var property2: kotlin.Int + internal final fun (): kotlin.Int + internal final fun (/*0*/ : kotlin.Int): kotlin.Unit private final var property3: java.lang.Object private final fun (): java.lang.Object - private final fun (/*0*/ : java.lang.Object): jet.Unit - protected final var property4: jet.String - protected final fun (): jet.String - protected final fun (/*0*/ : jet.String): jet.Unit - public final var property5: jet.Int - public final fun (): jet.Int - public final fun (/*0*/ : jet.Int): jet.Unit + private final fun (/*0*/ : java.lang.Object): kotlin.Unit + protected final var property4: kotlin.String + protected final fun (): kotlin.String + protected final fun (/*0*/ : kotlin.String): kotlin.Unit + public final var property5: kotlin.Int + public final fun (): kotlin.Int + public final fun (/*0*/ : kotlin.Int): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.txt index 1321fff4c42..f4e41058c22 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.txt @@ -2,23 +2,23 @@ package test internal open class ClassVarModality { /*primary*/ public constructor ClassVarModality() - internal open var property1: jet.Int - internal open fun (): jet.Int - internal open fun (/*0*/ : jet.Int): jet.Unit - internal final var property2: jet.Int - internal final fun (): jet.Int - internal final fun (/*0*/ : jet.Int): jet.Unit - internal open var property3: jet.Int - internal open fun (): jet.Int - private open fun (/*0*/ : jet.Int): jet.Unit - internal final var property4: jet.Int - internal final fun (): jet.Int - private final fun (/*0*/ : jet.Int): jet.Unit + internal open var property1: kotlin.Int + internal open fun (): kotlin.Int + internal open fun (/*0*/ : kotlin.Int): kotlin.Unit + internal final var property2: kotlin.Int + internal final fun (): kotlin.Int + internal final fun (/*0*/ : kotlin.Int): kotlin.Unit + internal open var property3: kotlin.Int + internal open fun (): kotlin.Int + private open fun (/*0*/ : kotlin.Int): kotlin.Unit + internal final var property4: kotlin.Int + internal final fun (): kotlin.Int + private final fun (/*0*/ : kotlin.Int): kotlin.Unit } internal abstract class ClassVarModalityAbstract { /*primary*/ public constructor ClassVarModalityAbstract() internal abstract var property1: java.util.Date internal abstract fun (): java.util.Date - public abstract fun (/*0*/ : java.util.Date): jet.Unit + public abstract fun (/*0*/ : java.util.Date): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.txt index 5c54dd0d1f2..d69ffc6cfd1 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.txt @@ -1,20 +1,20 @@ package test internal final class ClassVarParams { - /*primary*/ public constructor ClassVarParams(/*0*/ pr1: jet.String, /*1*/ pr2: jet.Int, /*2*/ pr3: jet.Long, /*3*/ pr4: java.util.Date, /*4*/ pr5: jet.Any, /*5*/ pr6: java.lang.Object) - internal final var pr1: jet.String - internal final fun (): jet.String - internal final fun (/*0*/ : jet.String): jet.Unit - internal final var pr2: jet.Int - internal final fun (): jet.Int - internal final fun (/*0*/ : jet.Int): jet.Unit - private final var pr3: jet.Long - private final fun (): jet.Long - private final fun (/*0*/ : jet.Long): jet.Unit + /*primary*/ public constructor ClassVarParams(/*0*/ pr1: kotlin.String, /*1*/ pr2: kotlin.Int, /*2*/ pr3: kotlin.Long, /*3*/ pr4: java.util.Date, /*4*/ pr5: kotlin.Any, /*5*/ pr6: java.lang.Object) + internal final var pr1: kotlin.String + internal final fun (): kotlin.String + internal final fun (/*0*/ : kotlin.String): kotlin.Unit + internal final var pr2: kotlin.Int + internal final fun (): kotlin.Int + internal final fun (/*0*/ : kotlin.Int): kotlin.Unit + private final var pr3: kotlin.Long + private final fun (): kotlin.Long + private final fun (/*0*/ : kotlin.Long): kotlin.Unit protected final var pr4: java.util.Date protected final fun (): java.util.Date - protected final fun (/*0*/ : java.util.Date): jet.Unit - public final var pr5: jet.Any - public final fun (): jet.Any - public final fun (/*0*/ : jet.Any): jet.Unit + protected final fun (/*0*/ : java.util.Date): kotlin.Unit + public final var pr5: kotlin.Any + public final fun (): kotlin.Any + public final fun (/*0*/ : kotlin.Any): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt index 3b335a11ade..4453ecbf452 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt @@ -2,19 +2,19 @@ package test internal final class ClassVal { /*primary*/ public constructor ClassVal() - internal final var property1: jet.Int - internal final fun (): jet.Int - internal final fun (/*0*/ : jet.Int): jet.Unit - internal final var property2: jet.Int - internal final fun (): jet.Int - internal final fun (/*0*/ : jet.Int): jet.Unit + internal final var property1: kotlin.Int + internal final fun (): kotlin.Int + internal final fun (/*0*/ : kotlin.Int): kotlin.Unit + internal final var property2: kotlin.Int + internal final fun (): kotlin.Int + internal final fun (/*0*/ : kotlin.Int): kotlin.Unit private final var property3: java.lang.Object private final fun (): java.lang.Object - private final fun (/*0*/ : java.lang.Object): jet.Unit - protected final var property4: jet.String - protected final fun (): jet.String - protected final fun (/*0*/ : jet.String): jet.Unit - public final var property5: jet.Int - public final fun (): jet.Int - public final fun (/*0*/ : jet.Int): jet.Unit + private final fun (/*0*/ : java.lang.Object): kotlin.Unit + protected final var property4: kotlin.String + protected final fun (): kotlin.String + protected final fun (/*0*/ : kotlin.String): kotlin.Unit + public final var property5: kotlin.Int + public final fun (): kotlin.Int + public final fun (/*0*/ : kotlin.Int): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt index cbc87ea5dfc..a65e02834a5 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt @@ -2,37 +2,37 @@ package test internal final class ClassVal { /*primary*/ public constructor ClassVal() - internal final var property1: jet.Int - internal final fun (): jet.Int - internal final fun (/*0*/ : jet.Int): jet.Unit - public final var property10: jet.Int - public final fun (): jet.Int - protected final fun (/*0*/ : jet.Int): jet.Unit - public final var property11: jet.Int - public final fun (): jet.Int - internal final fun (/*0*/ : jet.Int): jet.Unit + internal final var property1: kotlin.Int + internal final fun (): kotlin.Int + internal final fun (/*0*/ : kotlin.Int): kotlin.Unit + public final var property10: kotlin.Int + public final fun (): kotlin.Int + protected final fun (/*0*/ : kotlin.Int): kotlin.Unit + public final var property11: kotlin.Int + public final fun (): kotlin.Int + internal final fun (/*0*/ : kotlin.Int): kotlin.Unit internal final var property2: java.lang.Object internal final fun (): java.lang.Object - protected final fun (/*0*/ : java.lang.Object): jet.Unit + protected final fun (/*0*/ : java.lang.Object): kotlin.Unit internal final var property3: java.lang.Object internal final fun (): java.lang.Object - private final fun (/*0*/ : java.lang.Object): jet.Unit - protected final var property4: jet.String - protected final fun (): jet.String - protected final fun (/*0*/ : jet.String): jet.Unit - protected final var property5: jet.String - protected final fun (): jet.String - private final fun (/*0*/ : jet.String): jet.Unit - protected final var property6: jet.String - protected final fun (): jet.String - internal final fun (/*0*/ : jet.String): jet.Unit + private final fun (/*0*/ : java.lang.Object): kotlin.Unit + protected final var property4: kotlin.String + protected final fun (): kotlin.String + protected final fun (/*0*/ : kotlin.String): kotlin.Unit + protected final var property5: kotlin.String + protected final fun (): kotlin.String + private final fun (/*0*/ : kotlin.String): kotlin.Unit + protected final var property6: kotlin.String + protected final fun (): kotlin.String + internal final fun (/*0*/ : kotlin.String): kotlin.Unit protected final var property7: java.util.Date protected final fun (): java.util.Date - public final fun (/*0*/ : java.util.Date): jet.Unit - public final var property8: jet.Int - public final fun (): jet.Int - public final fun (/*0*/ : jet.Int): jet.Unit - public final var property9: jet.Int - public final fun (): jet.Int - private final fun (/*0*/ : jet.Int): jet.Unit + public final fun (/*0*/ : java.util.Date): kotlin.Unit + public final var property8: kotlin.Int + public final fun (): kotlin.Int + public final fun (/*0*/ : kotlin.Int): kotlin.Unit + public final var property9: kotlin.Int + public final fun (): kotlin.Int + private final fun (/*0*/ : kotlin.Int): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.txt index 46213e14aa7..e7d636260c8 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.txt @@ -1,10 +1,10 @@ package test -internal val jet.Long.date1: java.lang.Object - internal fun jet.Long.(): java.lang.Object -internal val jet.Long.date12: java.lang.Object - internal fun jet.Long.(): java.lang.Object -private val jet.Long.date3: java.util.Date - private fun jet.Long.(): java.util.Date -public val jet.Long.date4: java.util.Date - public fun jet.Long.(): java.util.Date +internal val kotlin.Long.date1: java.lang.Object + internal fun kotlin.Long.(): java.lang.Object +internal val kotlin.Long.date12: java.lang.Object + internal fun kotlin.Long.(): java.lang.Object +private val kotlin.Long.date3: java.util.Date + private fun kotlin.Long.(): java.util.Date +public val kotlin.Long.date4: java.util.Date + public fun kotlin.Long.(): java.util.Date diff --git a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.txt index c0a1e7169b5..144df367248 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.txt @@ -1,14 +1,14 @@ package test -internal var jet.Long.date1: java.lang.Object - internal fun jet.Long.(): java.lang.Object - internal fun jet.Long.(/*0*/ : java.lang.Object): jet.Unit -internal var jet.Long.date12: java.lang.Object - internal fun jet.Long.(): java.lang.Object - internal fun jet.Long.(/*0*/ : java.lang.Object): jet.Unit -private var jet.Long.date3: java.util.Date - private fun jet.Long.(): java.util.Date - private fun jet.Long.(/*0*/ : java.util.Date): jet.Unit -public var jet.Long.date5: java.util.Date - public fun jet.Long.(): java.util.Date - public fun jet.Long.(/*0*/ : java.util.Date): jet.Unit +internal var kotlin.Long.date1: java.lang.Object + internal fun kotlin.Long.(): java.lang.Object + internal fun kotlin.Long.(/*0*/ : java.lang.Object): kotlin.Unit +internal var kotlin.Long.date12: java.lang.Object + internal fun kotlin.Long.(): java.lang.Object + internal fun kotlin.Long.(/*0*/ : java.lang.Object): kotlin.Unit +private var kotlin.Long.date3: java.util.Date + private fun kotlin.Long.(): java.util.Date + private fun kotlin.Long.(/*0*/ : java.util.Date): kotlin.Unit +public var kotlin.Long.date5: java.util.Date + public fun kotlin.Long.(): java.util.Date + public fun kotlin.Long.(/*0*/ : java.util.Date): kotlin.Unit diff --git a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLongWithSet.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLongWithSet.txt index 62c3787891a..f59219bcd60 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLongWithSet.txt +++ b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLongWithSet.txt @@ -1,29 +1,29 @@ package test -internal var jet.Long.date1: java.lang.Object - internal fun jet.Long.(): java.lang.Object - internal fun jet.Long.(/*0*/ : java.lang.Object): jet.Unit -public var jet.Long.date10: java.util.Date - public fun jet.Long.(): java.util.Date - protected fun jet.Long.(/*0*/ : java.util.Date): jet.Unit -public var jet.Long.date11: java.util.Date - public fun jet.Long.(): java.util.Date - public fun jet.Long.(/*0*/ : java.util.Date): jet.Unit -internal var jet.Long.date2: java.lang.Object - internal fun jet.Long.(): java.lang.Object - protected fun jet.Long.(/*0*/ : java.lang.Object): jet.Unit -internal var jet.Long.date3: java.lang.Object - internal fun jet.Long.(): java.lang.Object - private fun jet.Long.(/*0*/ : java.lang.Object): jet.Unit -private var jet.Long.date4: java.util.Date - private fun jet.Long.(): java.util.Date - private fun jet.Long.(/*0*/ : java.util.Date): jet.Unit -public var jet.Long.date7: java.util.Date - public fun jet.Long.(): java.util.Date - public fun jet.Long.(/*0*/ : java.util.Date): jet.Unit -public var jet.Long.date8: java.util.Date - public fun jet.Long.(): java.util.Date - internal fun jet.Long.(/*0*/ : java.util.Date): jet.Unit -public var jet.Long.date9: java.util.Date - public fun jet.Long.(): java.util.Date - private fun jet.Long.(/*0*/ : java.util.Date): jet.Unit +internal var kotlin.Long.date1: java.lang.Object + internal fun kotlin.Long.(): java.lang.Object + internal fun kotlin.Long.(/*0*/ : java.lang.Object): kotlin.Unit +public var kotlin.Long.date10: java.util.Date + public fun kotlin.Long.(): java.util.Date + protected fun kotlin.Long.(/*0*/ : java.util.Date): kotlin.Unit +public var kotlin.Long.date11: java.util.Date + public fun kotlin.Long.(): java.util.Date + public fun kotlin.Long.(/*0*/ : java.util.Date): kotlin.Unit +internal var kotlin.Long.date2: java.lang.Object + internal fun kotlin.Long.(): java.lang.Object + protected fun kotlin.Long.(/*0*/ : java.lang.Object): kotlin.Unit +internal var kotlin.Long.date3: java.lang.Object + internal fun kotlin.Long.(): java.lang.Object + private fun kotlin.Long.(/*0*/ : java.lang.Object): kotlin.Unit +private var kotlin.Long.date4: java.util.Date + private fun kotlin.Long.(): java.util.Date + private fun kotlin.Long.(/*0*/ : java.util.Date): kotlin.Unit +public var kotlin.Long.date7: java.util.Date + public fun kotlin.Long.(): java.util.Date + public fun kotlin.Long.(/*0*/ : java.util.Date): kotlin.Unit +public var kotlin.Long.date8: java.util.Date + public fun kotlin.Long.(): java.util.Date + internal fun kotlin.Long.(/*0*/ : java.util.Date): kotlin.Unit +public var kotlin.Long.date9: java.util.Date + public fun kotlin.Long.(): java.util.Date + private fun kotlin.Long.(/*0*/ : java.util.Date): kotlin.Unit diff --git a/compiler/testData/loadJava/compiledKotlin/type/Any.txt b/compiler/testData/loadJava/compiledKotlin/type/Any.txt index c773a9a4fa4..af71f747572 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/Any.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/Any.txt @@ -1,3 +1,3 @@ package test -internal fun any(): jet.Any +internal fun any(): kotlin.Any diff --git a/compiler/testData/loadJava/compiledKotlin/type/AnyQ.txt b/compiler/testData/loadJava/compiledKotlin/type/AnyQ.txt index 9c88b247229..64070f5eb5b 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/AnyQ.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/AnyQ.txt @@ -1,3 +1,3 @@ package test -internal fun anyq(): jet.Any? +internal fun anyq(): kotlin.Any? diff --git a/compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.txt b/compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.txt index ccded112c39..e75dfe52e38 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.txt @@ -1,3 +1,3 @@ package test -internal fun nothing(): jet.Array +internal fun nothing(): kotlin.Array diff --git a/compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.txt b/compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.txt index d0bd1c85d13..031ce1f50ff 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.txt @@ -1,3 +1,3 @@ package test -internal fun fff(): jet.Array +internal fun fff(): kotlin.Array diff --git a/compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.txt b/compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.txt index d21bca23863..318659f5305 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.txt @@ -1,3 +1,3 @@ package test -internal fun nothing(): jet.Array +internal fun nothing(): kotlin.Array diff --git a/compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.txt b/compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.txt index 811adce7f2a..b5eb02cb1d9 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.txt @@ -1,3 +1,3 @@ package test -internal fun nothing(): jet.Array +internal fun nothing(): kotlin.Array diff --git a/compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.txt b/compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.txt index eccd2d59c1e..43d4d95937c 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.txt @@ -1,3 +1,3 @@ package test -internal fun nothing(): jet.Array +internal fun nothing(): kotlin.Array diff --git a/compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.txt b/compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.txt index ca57390241e..534754a6634 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.txt @@ -1,3 +1,3 @@ package test -internal fun fff(): jet.Array +internal fun fff(): kotlin.Array diff --git a/compiler/testData/loadJava/compiledKotlin/type/Function1IntString.txt b/compiler/testData/loadJava/compiledKotlin/type/Function1IntString.txt index 0d4ee4e1f5a..1e0b7b8887c 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/Function1IntString.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/Function1IntString.txt @@ -1,3 +1,3 @@ package test -internal fun fun1(): (jet.String) -> jet.Int +internal fun fun1(): (kotlin.String) -> kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/type/Int.txt b/compiler/testData/loadJava/compiledKotlin/type/Int.txt index 4e772ebd2e9..5b4a3c09321 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/Int.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/Int.txt @@ -1,3 +1,3 @@ package test -internal fun fff(): jet.Int +internal fun fff(): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/type/IntArray.txt b/compiler/testData/loadJava/compiledKotlin/type/IntArray.txt index 5a865710275..53439025fb1 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/IntArray.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/IntArray.txt @@ -1,3 +1,3 @@ package test -internal fun nothing(): jet.IntArray +internal fun nothing(): kotlin.IntArray diff --git a/compiler/testData/loadJava/compiledKotlin/type/IntQ.txt b/compiler/testData/loadJava/compiledKotlin/type/IntQ.txt index 63408cae4a5..4ca08b0a56c 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/IntQ.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/IntQ.txt @@ -1,3 +1,3 @@ package test -internal fun fff(): jet.Int? +internal fun fff(): kotlin.Int? diff --git a/compiler/testData/loadJava/compiledKotlin/type/ListOfAny.txt b/compiler/testData/loadJava/compiledKotlin/type/ListOfAny.txt index 49c6d0da497..f45d26f9faf 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/ListOfAny.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/ListOfAny.txt @@ -1,3 +1,3 @@ package test -internal fun listOfAny(): jet.List +internal fun listOfAny(): kotlin.List diff --git a/compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.txt b/compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.txt index c32cb53ae4f..c9b41dcb431 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.txt @@ -1,3 +1,3 @@ package test -internal fun listOfAnyQ(): jet.List +internal fun listOfAnyQ(): kotlin.List diff --git a/compiler/testData/loadJava/compiledKotlin/type/ListOfStar.txt b/compiler/testData/loadJava/compiledKotlin/type/ListOfStar.txt index d11af124740..180c4781cb9 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/ListOfStar.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/ListOfStar.txt @@ -1,3 +1,3 @@ package test -internal fun listOfStar(): jet.List +internal fun listOfStar(): kotlin.List diff --git a/compiler/testData/loadJava/compiledKotlin/type/ListOfString.txt b/compiler/testData/loadJava/compiledKotlin/type/ListOfString.txt index d7ac443fdef..05529c6857a 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/ListOfString.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/ListOfString.txt @@ -1,3 +1,3 @@ package test -internal fun fff(): java.util.List +internal fun fff(): java.util.List diff --git a/compiler/testData/loadJava/compiledKotlin/type/Nothing.txt b/compiler/testData/loadJava/compiledKotlin/type/Nothing.txt index 8fe8eab7f80..53fbdb7d28d 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/Nothing.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/Nothing.txt @@ -1,3 +1,3 @@ package test -internal fun nothing(): jet.Nothing +internal fun nothing(): kotlin.Nothing diff --git a/compiler/testData/loadJava/compiledKotlin/type/NothingQ.txt b/compiler/testData/loadJava/compiledKotlin/type/NothingQ.txt index 3ac5d1ba990..aa8830fcc31 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/NothingQ.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/NothingQ.txt @@ -1,3 +1,3 @@ package test -internal fun nothingq(): jet.Nothing? +internal fun nothingq(): kotlin.Nothing? diff --git a/compiler/testData/loadJava/compiledKotlin/type/String.txt b/compiler/testData/loadJava/compiledKotlin/type/String.txt index bc7280600d7..0555ee41abf 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/String.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/String.txt @@ -1,3 +1,3 @@ package test -internal fun fff(): jet.String +internal fun fff(): kotlin.String diff --git a/compiler/testData/loadJava/compiledKotlin/type/StringQ.txt b/compiler/testData/loadJava/compiledKotlin/type/StringQ.txt index 648c664b3ca..a2fff10686a 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/StringQ.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/StringQ.txt @@ -1,3 +1,3 @@ package test -internal fun fff(): jet.String? +internal fun fff(): kotlin.String? diff --git a/compiler/testData/loadJava/compiledKotlin/type/Unit.txt b/compiler/testData/loadJava/compiledKotlin/type/Unit.txt index c240764c997..9738d521eb7 100644 --- a/compiler/testData/loadJava/compiledKotlin/type/Unit.txt +++ b/compiler/testData/loadJava/compiledKotlin/type/Unit.txt @@ -1,3 +1,3 @@ package test -internal fun unit(): jet.Unit +internal fun unit(): kotlin.Unit diff --git a/compiler/testData/loadJava/compiledKotlin/visibility/InternalAbstractTraitMembersOverridden.txt b/compiler/testData/loadJava/compiledKotlin/visibility/InternalAbstractTraitMembersOverridden.txt index 57eb1fc7680..4bd2ae8478e 100644 --- a/compiler/testData/loadJava/compiledKotlin/visibility/InternalAbstractTraitMembersOverridden.txt +++ b/compiler/testData/loadJava/compiledKotlin/visibility/InternalAbstractTraitMembersOverridden.txt @@ -1,20 +1,20 @@ package test internal trait A { - public abstract var p: jet.Int - public abstract fun (): jet.Int - public abstract fun (/*0*/ : jet.Int): jet.Unit - internal abstract val v: jet.Int - internal abstract fun (): jet.Int - internal abstract fun f(): jet.Int + public abstract var p: kotlin.Int + public abstract fun (): kotlin.Int + public abstract fun (/*0*/ : kotlin.Int): kotlin.Unit + internal abstract val v: kotlin.Int + internal abstract fun (): kotlin.Int + internal abstract fun f(): kotlin.Int } internal final class B : test.A { /*primary*/ public constructor B() - public open override /*1*/ var p: jet.Int - public open override /*1*/ fun (): jet.Int - public open override /*1*/ fun (/*0*/ : jet.Int): jet.Unit - internal open override /*1*/ val v: jet.Int - internal open override /*1*/ fun (): jet.Int - internal open override /*1*/ fun f(): jet.Int + public open override /*1*/ var p: kotlin.Int + public open override /*1*/ fun (): kotlin.Int + public open override /*1*/ fun (/*0*/ : kotlin.Int): kotlin.Unit + internal open override /*1*/ val v: kotlin.Int + internal open override /*1*/ fun (): kotlin.Int + internal open override /*1*/ fun f(): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.txt b/compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.txt index b64102d03b2..493adf2147b 100644 --- a/compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.txt +++ b/compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.txt @@ -1,5 +1,5 @@ package test -internal val x: jet.Int - internal fun (): jet.Int -internal fun f(): jet.Int +internal val x: kotlin.Int + internal fun (): kotlin.Int +internal fun f(): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembers.txt b/compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembers.txt index 6673479f1f3..935a3518428 100644 --- a/compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembers.txt +++ b/compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembers.txt @@ -1,10 +1,10 @@ package test internal trait A { - public abstract var p: jet.Int - public abstract fun (): jet.Int - internal abstract fun (/*0*/ : jet.Int): jet.Unit - internal abstract val v: jet.Int - internal abstract fun (): jet.Int - internal abstract fun f(): jet.Int + public abstract var p: kotlin.Int + public abstract fun (): kotlin.Int + internal abstract fun (/*0*/ : kotlin.Int): kotlin.Unit + internal abstract val v: kotlin.Int + internal abstract fun (): kotlin.Int + internal abstract fun f(): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembersInherited.txt b/compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembersInherited.txt index b82d6481802..bf008557e73 100644 --- a/compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembersInherited.txt +++ b/compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembersInherited.txt @@ -1,20 +1,20 @@ package test internal trait A { - public open var p: jet.Int - public open fun (): jet.Int - internal open fun (/*0*/ value: jet.Int): jet.Unit - internal open val v: jet.Int - internal open fun (): jet.Int - internal open fun f(): jet.Int + public open var p: kotlin.Int + public open fun (): kotlin.Int + internal open fun (/*0*/ value: kotlin.Int): kotlin.Unit + internal open val v: kotlin.Int + internal open fun (): kotlin.Int + internal open fun f(): kotlin.Int } internal final class B : test.A { /*primary*/ public constructor B() - public open override /*1*/ /*fake_override*/ var p: jet.Int - public open override /*1*/ /*fake_override*/ fun (): jet.Int - internal open override /*1*/ /*fake_override*/ fun (/*0*/ value: jet.Int): jet.Unit - internal open override /*1*/ /*fake_override*/ val v: jet.Int - internal open override /*1*/ /*fake_override*/ fun (): jet.Int - internal open override /*1*/ /*fake_override*/ fun f(): jet.Int + public open override /*1*/ /*fake_override*/ var p: kotlin.Int + public open override /*1*/ /*fake_override*/ fun (): kotlin.Int + internal open override /*1*/ /*fake_override*/ fun (/*0*/ value: kotlin.Int): kotlin.Unit + internal open override /*1*/ /*fake_override*/ val v: kotlin.Int + internal open override /*1*/ /*fake_override*/ fun (): kotlin.Int + internal open override /*1*/ /*fake_override*/ fun f(): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.txt b/compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.txt index f76c32ecaf1..55fea1773a7 100644 --- a/compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.txt +++ b/compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.txt @@ -1,3 +1,3 @@ package test -private fun topLevelFun(): jet.Int +private fun topLevelFun(): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.txt b/compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.txt index e01cbc6d245..548acd79c1f 100644 --- a/compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.txt +++ b/compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.txt @@ -1,4 +1,4 @@ package test -private val topLevelVal: jet.Int - private fun (): jet.Int +private val topLevelVal: kotlin.Int + private fun (): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.txt b/compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.txt index 9a660002671..ca90f848ccb 100644 --- a/compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.txt +++ b/compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.txt @@ -1,5 +1,5 @@ package test -internal var topLevelVar: jet.Int - internal fun (): jet.Int - private fun (/*0*/ : jet.Int): jet.Unit +internal var topLevelVar: kotlin.Int + internal fun (): kotlin.Int + private fun (/*0*/ : kotlin.Int): kotlin.Unit diff --git a/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritAmbguousSamAdaptersInKotlin.txt b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritAmbguousSamAdaptersInKotlin.txt index 61892db0918..9983d4574b4 100644 --- a/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritAmbguousSamAdaptersInKotlin.txt +++ b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritAmbguousSamAdaptersInKotlin.txt @@ -2,16 +2,16 @@ package test public final class Sub : test.Super { public constructor Sub() - public/*package*/ final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> jet.Unit)?): jet.Unit - public/*package*/ final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> jet.Unit)?): jet.Unit - public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.io.Closeable?): jet.Unit - public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): jet.Unit + public/*package*/ final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit + public/*package*/ final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit + public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.io.Closeable?): kotlin.Unit + public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit } public open class Super : java.lang.Object { public constructor Super() - public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> jet.Unit)?): jet.Unit - public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> jet.Unit)?): jet.Unit - public/*package*/ open fun foo(/*0*/ r: java.io.Closeable?): jet.Unit - public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable?): jet.Unit + public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit + public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit + public/*package*/ open fun foo(/*0*/ r: java.io.Closeable?): kotlin.Unit + public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit } diff --git a/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritSamAdapterInKotlin.txt b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritSamAdapterInKotlin.txt index 1852e062096..9d547874231 100644 --- a/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritSamAdapterInKotlin.txt +++ b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritSamAdapterInKotlin.txt @@ -2,12 +2,12 @@ package test public final class Sub : test.Super { public constructor Sub() - public/*package*/ final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> jet.Unit)?): jet.Unit - public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): jet.Unit + public/*package*/ final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit + public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit } public open class Super : java.lang.Object { public constructor Super() - public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> jet.Unit)?): jet.Unit - public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable?): jet.Unit + public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit + public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit } diff --git a/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/OverrideSamAdapterInKotlin.txt b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/OverrideSamAdapterInKotlin.txt index 6b150dab673..60655f90690 100644 --- a/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/OverrideSamAdapterInKotlin.txt +++ b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/OverrideSamAdapterInKotlin.txt @@ -2,12 +2,12 @@ package test public final class Sub : test.Super { public constructor Sub() - internal open override /*1*/ fun foo(/*0*/ r: (() -> jet.Unit)?): jet.Unit - public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): jet.Unit + internal open override /*1*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit + public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit } public open class Super : java.lang.Object { public constructor Super() - public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> jet.Unit)?): jet.Unit - public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable?): jet.Unit + public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit + public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit } diff --git a/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForInheritedFromKotlin.txt b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForInheritedFromKotlin.txt index ed2897ad5d0..1788dd95aa9 100644 --- a/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForInheritedFromKotlin.txt +++ b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForInheritedFromKotlin.txt @@ -2,10 +2,10 @@ package test public open class Sub : test.Super { public constructor Sub() - internal final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable): jet.Unit + internal final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable): kotlin.Unit } public final class Super { public constructor Super() - internal final fun foo(/*0*/ r: java.lang.Runnable): jet.Unit + internal final fun foo(/*0*/ r: java.lang.Runnable): kotlin.Unit } diff --git a/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin.txt b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin.txt index 7ffeefde529..2b4ba5db886 100644 --- a/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin.txt +++ b/compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin.txt @@ -2,11 +2,11 @@ package test public open class Sub : test.Super { public constructor Sub() - public final /*synthesized*/ fun foo(/*0*/ r: () -> jet.Unit): jet.Unit - public open override /*1*/ fun foo(/*0*/ r: java.lang.Runnable): jet.Unit + public final /*synthesized*/ fun foo(/*0*/ r: () -> kotlin.Unit): kotlin.Unit + public open override /*1*/ fun foo(/*0*/ r: java.lang.Runnable): kotlin.Unit } public final class Super { public constructor Super() - internal final fun foo(/*0*/ r: java.lang.Runnable): jet.Unit + internal final fun foo(/*0*/ r: java.lang.Runnable): kotlin.Unit } diff --git a/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/DeepSubclassingKotlinInJava.txt b/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/DeepSubclassingKotlinInJava.txt index 0d8f6acf9dc..8f00c29fcc6 100644 --- a/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/DeepSubclassingKotlinInJava.txt +++ b/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/DeepSubclassingKotlinInJava.txt @@ -2,30 +2,30 @@ package test public open class A { public constructor A() - public open fun foo(): jet.String + public open fun foo(): kotlin.String } public open class B : test.A { public constructor B() - public open override /*1*/ fun foo(): jet.String + public open override /*1*/ fun foo(): kotlin.String } public open class C : test.B { public constructor C() - public open override /*1*/ fun foo(): jet.String + public open override /*1*/ fun foo(): kotlin.String } public open class D : test.C { public constructor D() - public open override /*1*/ fun foo(): jet.String + public open override /*1*/ fun foo(): kotlin.String } public open class E : test.D { public constructor E() - public open override /*1*/ fun foo(): jet.String + public open override /*1*/ fun foo(): kotlin.String } public open class F : test.E { public constructor F() - public open override /*1*/ fun foo(): jet.String + public open override /*1*/ fun foo(): kotlin.String } diff --git a/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot.txt b/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot.txt index fd0efdb3f72..d6713d6b4f8 100644 --- a/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot.txt +++ b/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot.txt @@ -1,18 +1,18 @@ package test public trait Sub : test.Super1, test.Super2 { - public abstract override /*1*/ fun bar(/*0*/ vararg p: jet.String /*jet.Array*/): jet.Unit - public abstract override /*1*/ fun foo(/*0*/ p: jet.String): jet.Unit - public abstract override /*1*/ /*fake_override*/ fun jet.Array.bar(): jet.Unit - public abstract override /*1*/ /*fake_override*/ fun jet.String.foo(): jet.Unit + public abstract override /*1*/ fun bar(/*0*/ vararg p: kotlin.String /*kotlin.Array*/): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p: kotlin.String): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun kotlin.Array.bar(): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun kotlin.String.foo(): kotlin.Unit } public trait Super1 { - public abstract fun jet.Array.bar(): jet.Unit - public abstract fun jet.String.foo(): jet.Unit + public abstract fun kotlin.Array.bar(): kotlin.Unit + public abstract fun kotlin.String.foo(): kotlin.Unit } public trait Super2 { - public abstract fun bar(/*0*/ vararg p: jet.String /*jet.Array*/): jet.Unit - public abstract fun foo(/*0*/ p: jet.String): jet.Unit + public abstract fun bar(/*0*/ vararg p: kotlin.String /*kotlin.Array*/): kotlin.Unit + public abstract fun foo(/*0*/ p: kotlin.String): kotlin.Unit } diff --git a/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionFunction.txt b/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionFunction.txt index c08879340ac..551c78965c8 100644 --- a/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionFunction.txt +++ b/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionFunction.txt @@ -2,12 +2,12 @@ package test public open class Sub : test.Super { public constructor Sub() - public open override /*1*/ fun jet.String.bar(/*0*/ param: jet.String): jet.String - public final override /*1*/ /*fake_override*/ fun jet.String.foo(): jet.Unit + public open override /*1*/ fun kotlin.String.bar(/*0*/ param: kotlin.String): kotlin.String + public final override /*1*/ /*fake_override*/ fun kotlin.String.foo(): kotlin.Unit } public open class Super { public constructor Super() - public abstract fun jet.String.bar(/*0*/ p: jet.String): jet.Unit - public final fun jet.String.foo(): jet.Unit + public abstract fun kotlin.String.bar(/*0*/ p: kotlin.String): kotlin.Unit + public final fun kotlin.String.foo(): kotlin.Unit } diff --git a/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassFromTraitImplementation.txt b/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassFromTraitImplementation.txt index 6e8529ba034..d695d8ad434 100644 --- a/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassFromTraitImplementation.txt +++ b/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassFromTraitImplementation.txt @@ -2,17 +2,17 @@ package test internal open class Impl : test.Trait { public constructor Impl() - internal open override /*1*/ /*fake_override*/ fun bar(): jet.String - internal open override /*1*/ /*fake_override*/ fun foo(): jet.String + internal open override /*1*/ /*fake_override*/ fun bar(): kotlin.String + internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.String } public open class Subclass : test.Impl { public constructor Subclass() - java.lang.Override() public open override /*1*/ fun bar(): jet.String - internal open override /*1*/ /*fake_override*/ fun foo(): jet.String + java.lang.Override() public open override /*1*/ fun bar(): kotlin.String + internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.String } internal trait Trait { - internal open fun bar(): jet.String - internal open fun foo(): jet.String + internal open fun bar(): kotlin.String + internal open fun foo(): kotlin.String } diff --git a/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassingKotlinInJava.txt b/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassingKotlinInJava.txt index 542a0ce3009..cd5842fdebe 100644 --- a/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassingKotlinInJava.txt +++ b/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassingKotlinInJava.txt @@ -2,10 +2,10 @@ package test public open class JavaSubclass : test.KotlinClass { public constructor JavaSubclass() - public open override /*1*/ fun foo(): jet.String + public open override /*1*/ fun foo(): kotlin.String } public open class KotlinClass { public constructor KotlinClass() - public open fun foo(): jet.String + public open fun foo(): kotlin.String } diff --git a/compiler/testData/loadJava/javaAgainstKotlin/visibility/PackageLocal.txt b/compiler/testData/loadJava/javaAgainstKotlin/visibility/PackageLocal.txt index 2b41d12562c..db104137e66 100644 --- a/compiler/testData/loadJava/javaAgainstKotlin/visibility/PackageLocal.txt +++ b/compiler/testData/loadJava/javaAgainstKotlin/visibility/PackageLocal.txt @@ -2,10 +2,10 @@ package test public open class Base : java.lang.Object { public constructor Base() - public/*package*/ open fun foo(): jet.Unit + public/*package*/ open fun foo(): kotlin.Unit } internal final class Derived : test.Base { public constructor Derived() - internal open override /*1*/ fun foo(): jet.Unit + internal open override /*1*/ fun foo(): kotlin.Unit } diff --git a/compiler/testData/loadJava/javaAgainstKotlin/visibility/ProtectedPackage.txt b/compiler/testData/loadJava/javaAgainstKotlin/visibility/ProtectedPackage.txt index be3c9e81a10..c998a584332 100644 --- a/compiler/testData/loadJava/javaAgainstKotlin/visibility/ProtectedPackage.txt +++ b/compiler/testData/loadJava/javaAgainstKotlin/visibility/ProtectedPackage.txt @@ -2,10 +2,10 @@ package test public open class Base : java.lang.Object { public constructor Base() - protected/*protected and package*/ open fun foo(): jet.Unit + protected/*protected and package*/ open fun foo(): kotlin.Unit } internal final class Derived : test.Base { public constructor Derived() - protected open override /*1*/ fun foo(): jet.Unit + protected open override /*1*/ fun foo(): kotlin.Unit } diff --git a/compiler/testData/loadJava/sourceJava/ErrorTypes.txt b/compiler/testData/loadJava/sourceJava/ErrorTypes.txt index 35b48d0334b..74af910bb82 100644 --- a/compiler/testData/loadJava/sourceJava/ErrorTypes.txt +++ b/compiler/testData/loadJava/sourceJava/ErrorTypes.txt @@ -3,13 +3,13 @@ package test public trait ErrorTypes : java.lang.Object { public trait Sub : test.ErrorTypes.Super { - public abstract fun errorTypeInParameter(/*0*/ list: jet.List?>?): jet.Unit - public abstract override /*1*/ /*fake_override*/ fun errorTypeInParameter(/*0*/ list: jet.List?>?): jet.Unit + public abstract fun errorTypeInParameter(/*0*/ list: kotlin.List?>?): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun errorTypeInParameter(/*0*/ list: kotlin.List?>?): kotlin.Unit public abstract override /*1*/ fun returnErrorType(): [ERROR : Unresolved java classifier: T]? } public trait Super : java.lang.Object { - public abstract fun errorTypeInParameter(/*0*/ list: jet.List?>?): jet.Unit + public abstract fun errorTypeInParameter(/*0*/ list: kotlin.List?>?): kotlin.Unit public abstract fun returnErrorType(): [ERROR : Unresolved java classifier: T]? } } diff --git a/compiler/testData/loadJava/sourceJava/NullInAnnotation.txt b/compiler/testData/loadJava/sourceJava/NullInAnnotation.txt index 451691a6ad0..c406e9f64ac 100644 --- a/compiler/testData/loadJava/sourceJava/NullInAnnotation.txt +++ b/compiler/testData/loadJava/sourceJava/NullInAnnotation.txt @@ -1,13 +1,13 @@ package test -public /*synthesized*/ fun NullInAnnotation(/*0*/ function: () -> jet.Unit): test.NullInAnnotation +public /*synthesized*/ fun NullInAnnotation(/*0*/ function: () -> kotlin.Unit): test.NullInAnnotation public trait NullInAnnotation : java.lang.Object { - test.NullInAnnotation.Ann(a = null: jet.Nothing?, b = {null}: jet.Array) public abstract fun foo(): jet.Unit + test.NullInAnnotation.Ann(a = null: kotlin.Nothing?, b = {null}: kotlin.Array) public abstract fun foo(): kotlin.Unit - public final annotation class Ann : jet.Annotation { - public constructor Ann(/*0*/ a: jet.String, /*1*/ vararg b: jet.String /*jet.Array*/) - public abstract fun a(): jet.String - public abstract fun b(): jet.Array + public final annotation class Ann : kotlin.Annotation { + public constructor Ann(/*0*/ a: kotlin.String, /*1*/ vararg b: kotlin.String /*kotlin.Array*/) + public abstract fun a(): kotlin.String + public abstract fun b(): kotlin.Array } } diff --git a/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.txt b/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.txt index 9626cdfa930..08fd864bab7 100644 --- a/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.txt +++ b/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.txt @@ -2,21 +2,21 @@ package test public trait ReturnNotSubtype : java.lang.Object { - public trait Sub : test.ReturnNotSubtype.Super { - public abstract override /*1*/ fun _void(): jet.Boolean - public abstract override /*1*/ fun array(): jet.Array? - public abstract override /*1*/ fun klass(): java.lang.Class? - public abstract override /*1*/ fun string1(): jet.Unit - public abstract override /*1*/ fun string2(): jet.MutableList? + public trait Sub : test.ReturnNotSubtype.Super { + public abstract override /*1*/ fun _void(): kotlin.Boolean + public abstract override /*1*/ fun array(): kotlin.Array? + public abstract override /*1*/ fun klass(): java.lang.Class? + public abstract override /*1*/ fun string1(): kotlin.Unit + public abstract override /*1*/ fun string2(): kotlin.MutableList? public abstract override /*1*/ fun t(): java.lang.Void? } public trait Super : java.lang.Object { - public abstract fun _void(): jet.Unit - public abstract fun array(): jet.Array? - public abstract fun klass(): java.lang.Class? - public abstract fun string1(): jet.String? - public abstract fun string2(): jet.String? + public abstract fun _void(): kotlin.Unit + public abstract fun array(): kotlin.Array? + public abstract fun klass(): java.lang.Class? + public abstract fun string1(): kotlin.String? + public abstract fun string2(): kotlin.String? public abstract fun t(): T? } } diff --git a/compiler/testData/loadJava/sourceJava/WrongNumberOfGenericParameters.txt b/compiler/testData/loadJava/sourceJava/WrongNumberOfGenericParameters.txt index 290ab9a0efa..9c7a5f2df01 100644 --- a/compiler/testData/loadJava/sourceJava/WrongNumberOfGenericParameters.txt +++ b/compiler/testData/loadJava/sourceJava/WrongNumberOfGenericParameters.txt @@ -1,9 +1,9 @@ package test public trait WrongNumberOfGenericParameters : java.lang.Object { - public abstract fun o0(): test.WrongNumberOfGenericParameters.One? + public abstract fun o0(): test.WrongNumberOfGenericParameters.One? public abstract fun o2(): test.WrongNumberOfGenericParameters.One<[ERROR : T]>? - public abstract fun t1(): test.WrongNumberOfGenericParameters.Two? + public abstract fun t1(): test.WrongNumberOfGenericParameters.Two? public abstract fun z(): test.WrongNumberOfGenericParameters.Zero? public trait One : java.lang.Object { diff --git a/compiler/testData/renderer/Classes.kt b/compiler/testData/renderer/Classes.kt index 0dd3ff1a751..28340c70762 100644 --- a/compiler/testData/renderer/Classes.kt +++ b/compiler/testData/renderer/Classes.kt @@ -29,27 +29,27 @@ public class WithReified public trait TwoUpperBounds where T : Number, T : Any //package rendererTest -//internal final annotation class TheAnnotation : jet.Annotation defined in rendererTest +//internal final annotation class TheAnnotation : kotlin.Annotation defined in rendererTest //public constructor TheAnnotation() defined in rendererTest.TheAnnotation -//rendererTest.TheAnnotation public open class TheClass defined in rendererTest -//public constructor TheClass() defined in rendererTest.TheClass -// defined in rendererTest.TheClass +//rendererTest.TheAnnotation public open class TheClass defined in rendererTest +//public constructor TheClass() defined in rendererTest.TheClass +// defined in rendererTest.TheClass // defined in rendererTest.TheClass -//private final val privateVal: jet.Int defined in rendererTest.TheClass -//internal final val shouldBeFinal: jet.Int defined in rendererTest.TheClass -//protected abstract fun foo(): jet.Unit defined in rendererTest.TheClass +//private final val privateVal: kotlin.Int defined in rendererTest.TheClass +//internal final val shouldBeFinal: kotlin.Int defined in rendererTest.TheClass +//protected abstract fun foo(): kotlin.Unit defined in rendererTest.TheClass //private final class Inner defined in rendererTest.TheClass //public constructor Inner() defined in rendererTest.TheClass.Inner //internal final class InternalClass defined in rendererTest //public constructor InternalClass() defined in rendererTest.InternalClass //internal trait TheTrait defined in rendererTest -//internal abstract fun abstractFun(): jet.Unit defined in rendererTest.TheTrait -//internal class object : rendererTest.TheClass defined in rendererTest.TheTrait +//internal abstract fun abstractFun(): kotlin.Unit defined in rendererTest.TheTrait +//internal class object : rendererTest.TheClass defined in rendererTest.TheTrait //private constructor () defined in rendererTest.TheTrait. -//internal final fun classObjectFunction(): jet.Int defined in rendererTest.TheTrait. +//internal final fun classObjectFunction(): kotlin.Int defined in rendererTest.TheTrait. //public final class WithReified defined in rendererTest //public constructor WithReified() defined in rendererTest.WithReified // defined in rendererTest.WithReified // defined in rendererTest.WithReified -//public trait TwoUpperBounds where T : jet.Any defined in rendererTest -// defined in rendererTest.TwoUpperBounds +//public trait TwoUpperBounds where T : kotlin.Any defined in rendererTest +// defined in rendererTest.TwoUpperBounds diff --git a/compiler/testData/renderer/Enum.kt b/compiler/testData/renderer/Enum.kt index 7584aacf29e..7314b8f6a23 100644 --- a/compiler/testData/renderer/Enum.kt +++ b/compiler/testData/renderer/Enum.kt @@ -5,8 +5,8 @@ private enum class TheEnum(val rgb: Int) { } //package rendererTest -//private final enum class TheEnum : jet.Enum defined in rendererTest -//private constructor TheEnum(rgb: jet.Int) defined in rendererTest.TheEnum -//value-parameter val rgb: jet.Int defined in rendererTest.TheEnum. +//private final enum class TheEnum : kotlin.Enum defined in rendererTest +//private constructor TheEnum(rgb: kotlin.Int) defined in rendererTest.TheEnum +//value-parameter val rgb: kotlin.Int defined in rendererTest.TheEnum. //public enum entry VAL1 : rendererTest.TheEnum defined in rendererTest.TheEnum //private constructor VAL1() defined in rendererTest.TheEnum.VAL1 diff --git a/compiler/testData/renderer/FunctionTypes.kt b/compiler/testData/renderer/FunctionTypes.kt index 82b3870a7d1..98873c91813 100644 --- a/compiler/testData/renderer/FunctionTypes.kt +++ b/compiler/testData/renderer/FunctionTypes.kt @@ -19,15 +19,15 @@ var v10: GF class GEF: ExtensionFunction0 var v11: GEF -//internal var v1: () -> jet.Unit defined in root package -//internal var v2: (jet.Int) -> jet.Int defined in root package -//internal var v3: (jet.Int, jet.String) -> jet.String defined in root package -//internal var v4: (jet.Int) -> jet.String defined in root package -//internal var v4: (() -> jet.Int, (jet.String) -> jet.Unit) -> jet.String defined in root package -//internal var v5: jet.Int.() -> jet.Int defined in root package -//internal var v6: jet.Int.(jet.String, jet.Int) -> jet.Unit defined in root package -//internal var v7: jet.Int.(jet.String) -> jet.Boolean defined in root package -//internal final class F : () -> jet.Unit defined in root package +//internal var v1: () -> kotlin.Unit defined in root package +//internal var v2: (kotlin.Int) -> kotlin.Int defined in root package +//internal var v3: (kotlin.Int, kotlin.String) -> kotlin.String defined in root package +//internal var v4: (kotlin.Int) -> kotlin.String defined in root package +//internal var v4: (() -> kotlin.Int, (kotlin.String) -> kotlin.Unit) -> kotlin.String defined in root package +//internal var v5: kotlin.Int.() -> kotlin.Int defined in root package +//internal var v6: kotlin.Int.(kotlin.String, kotlin.Int) -> kotlin.Unit defined in root package +//internal var v7: kotlin.Int.(kotlin.String) -> kotlin.Boolean defined in root package +//internal final class F : () -> kotlin.Unit defined in root package //public constructor F() defined in F //internal var v8: F defined in root package //internal final class EF defined in root package @@ -36,9 +36,9 @@ var v11: GEF //internal final class GF : () -> T defined in root package //public constructor GF() defined in GF // defined in GF -//internal var v10: GF defined in root package +//internal var v10: GF defined in root package //internal final class GEF : A.() -> B defined in root package //public constructor GEF() defined in GEF // defined in GEF // defined in GEF -//internal var v11: GEF defined in root package \ No newline at end of file +//internal var v11: GEF defined in root package diff --git a/compiler/testData/renderer/GlobalFunctions.kt b/compiler/testData/renderer/GlobalFunctions.kt index d3cd5fe63da..b7a437537be 100644 --- a/compiler/testData/renderer/GlobalFunctions.kt +++ b/compiler/testData/renderer/GlobalFunctions.kt @@ -20,19 +20,19 @@ fun

funTypeParameterWithTwoUpperBounds() where P : Foo, P : Bar = 17 deprecated("") fun deprecatedFun() //package rendererTest -//public fun pub(): jet.Unit defined in rendererTest -//internal fun int(): jet.String defined in rendererTest -//internal fun int2(vararg ints: jet.Int): jet.Int defined in rendererTest -//value-parameter vararg val ints: jet.Int defined in rendererTest.int2 -//private fun prv(a: jet.String, b: jet.Int = ...): jet.Int defined in rendererTest -//value-parameter val a: jet.String defined in rendererTest.prv -//value-parameter val b: jet.Int = ... defined in rendererTest.prv -//public fun jet.Int.ext(): jet.Int defined in rendererTest -//public fun withTypeParam(a: jet.Array): jet.Int defined in rendererTest +//public fun pub(): kotlin.Unit defined in rendererTest +//internal fun int(): kotlin.String defined in rendererTest +//internal fun int2(vararg ints: kotlin.Int): kotlin.Int defined in rendererTest +//value-parameter vararg val ints: kotlin.Int defined in rendererTest.int2 +//private fun prv(a: kotlin.String, b: kotlin.Int = ...): kotlin.Int defined in rendererTest +//value-parameter val a: kotlin.String defined in rendererTest.prv +//value-parameter val b: kotlin.Int = ... defined in rendererTest.prv +//public fun kotlin.Int.ext(): kotlin.Int defined in rendererTest +//public fun withTypeParam(a: kotlin.Array): kotlin.Int defined in rendererTest // defined in rendererTest.withTypeParam -//value-parameter val a: jet.Array defined in rendererTest.withTypeParam +//value-parameter val a: kotlin.Array defined in rendererTest.withTypeParam //internal trait Foo defined in rendererTest //internal trait Bar defined in rendererTest -//internal fun

funTypeParameterWithTwoUpperBounds(): jet.Int where P : rendererTest.Bar defined in rendererTest +//internal fun

funTypeParameterWithTwoUpperBounds(): kotlin.Int where P : rendererTest.Bar defined in rendererTest //

defined in rendererTest.funTypeParameterWithTwoUpperBounds -//jet.deprecated internal fun deprecatedFun(): jet.Unit defined in rendererTest +//kotlin.deprecated internal fun deprecatedFun(): kotlin.Unit defined in rendererTest diff --git a/compiler/testData/renderer/GlobalProperties.kt b/compiler/testData/renderer/GlobalProperties.kt index 10de7ef2f70..d2ebbad307e 100644 --- a/compiler/testData/renderer/GlobalProperties.kt +++ b/compiler/testData/renderer/GlobalProperties.kt @@ -17,13 +17,13 @@ public val T.extWithTwoUpperBounds: Int where T : CharSequence, T : Number get() {} //package rendererTest -//public val pub: jet.String defined in rendererTest -//internal var int: jet.String defined in rendererTest -//internal val int2: jet.Int defined in rendererTest -//private var private: jet.Int defined in rendererTest -//public val jet.Int.ext: jet.Int defined in rendererTest -//public fun jet.Int.(): jet.Int defined in rendererTest -//jet.deprecated internal val deprecatedVal: jet.Int defined in rendererTest -//public val T.extWithTwoUpperBounds: jet.Int where T : jet.Number defined in rendererTest -// defined in rendererTest -//public fun T.(): jet.Int defined in rendererTest +//public val pub: kotlin.String defined in rendererTest +//internal var int: kotlin.String defined in rendererTest +//internal val int2: kotlin.Int defined in rendererTest +//private var private: kotlin.Int defined in rendererTest +//public val kotlin.Int.ext: kotlin.Int defined in rendererTest +//public fun kotlin.Int.(): kotlin.Int defined in rendererTest +//kotlin.deprecated internal val deprecatedVal: kotlin.Int defined in rendererTest +//public val T.extWithTwoUpperBounds: kotlin.Int where T : kotlin.Number defined in rendererTest +// defined in rendererTest +//public fun T.(): kotlin.Int defined in rendererTest diff --git a/compiler/testData/renderer/InheritedMembersVisibility.kt b/compiler/testData/renderer/InheritedMembersVisibility.kt index 796a1a1361e..eb90eb900c7 100644 --- a/compiler/testData/renderer/InheritedMembersVisibility.kt +++ b/compiler/testData/renderer/InheritedMembersVisibility.kt @@ -16,15 +16,15 @@ class B : A { } //internal trait A defined in root package -//internal abstract val v: jet.Int defined in A -//public abstract var int: jet.Int defined in A -//private abstract fun (: jet.Int): jet.Unit defined in A -//protected abstract fun f(): jet.Int defined in A +//internal abstract val v: kotlin.Int defined in A +//public abstract var int: kotlin.Int defined in A +//private abstract fun (: kotlin.Int): kotlin.Unit defined in A +//protected abstract fun f(): kotlin.Int defined in A //internal final class B : A defined in root package //public constructor B() defined in B -//public open var int: jet.Int defined in B -//public open fun (): jet.Int defined in B -//private open fun (: jet.Int): jet.Unit defined in B -//protected open fun f(): jet.Int defined in B -//internal open val v: jet.Int defined in B -//internal open fun (): jet.Int defined in B +//public open var int: kotlin.Int defined in B +//public open fun (): kotlin.Int defined in B +//private open fun (: kotlin.Int): kotlin.Unit defined in B +//protected open fun f(): kotlin.Int defined in B +//internal open val v: kotlin.Int defined in B +//internal open fun (): kotlin.Int defined in B diff --git a/compiler/testData/renderer/KeywordsInNames.kt b/compiler/testData/renderer/KeywordsInNames.kt index 5498167ae63..360d166de3c 100644 --- a/compiler/testData/renderer/KeywordsInNames.kt +++ b/compiler/testData/renderer/KeywordsInNames.kt @@ -17,9 +17,9 @@ val AS_SAFE = 1 val NOT_IN = 2 val NOT_IS = 3 -//internal final annotation class `true` : jet.Annotation defined in root package +//internal final annotation class `true` : kotlin.Annotation defined in root package //public constructor `true`() defined in `true` -//internal val `val`: jet.Int defined in root package +//internal val `val`: kotlin.Int defined in root package //`true` internal trait `trait` defined in root package //internal final class `class`<`in`> defined in root package //public constructor `class`<`in`>(p: `in`?) defined in `class` @@ -29,9 +29,9 @@ val NOT_IS = 3 //public constructor `class`() defined in `class`.`class` //internal val `is`: `class`.`class` defined in root package //internal val `in`: `class`<`trait`> defined in root package -//internal fun <`in` : `trait`> `trait`.`fun`(`false`: `trait`): `trait` where `in` : jet.Number defined in root package -//<`in` : `trait` & jet.Number> defined in `fun` +//internal fun <`in` : `trait`> `trait`.`fun`(`false`: `trait`): `trait` where `in` : kotlin.Number defined in root package +//<`in` : `trait` & kotlin.Number> defined in `fun` //value-parameter val `false`: `trait` defined in `fun` -//internal val AS_SAFE: jet.Int defined in root package -//internal val NOT_IN: jet.Int defined in root package -//internal val NOT_IS: jet.Int defined in root package +//internal val AS_SAFE: kotlin.Int defined in root package +//internal val NOT_IN: kotlin.Int defined in root package +//internal val NOT_IS: kotlin.Int defined in root package diff --git a/compiler/testData/renderer/UnitType.kt b/compiler/testData/renderer/UnitType.kt index a88ecb8c1fd..3b754438417 100644 --- a/compiler/testData/renderer/UnitType.kt +++ b/compiler/testData/renderer/UnitType.kt @@ -1,5 +1,5 @@ var v1: Unit var v2: Unit? -//internal var v1: jet.Unit defined in root package -//internal var v2: jet.Unit? defined in root package +//internal var v1: kotlin.Unit defined in root package +//internal var v2: kotlin.Unit? defined in root package diff --git a/compiler/testData/repl/analyzeErrors.repl b/compiler/testData/repl/analyzeErrors.repl index ab23e02b5e4..9da9f4ee905 100644 --- a/compiler/testData/repl/analyzeErrors.repl +++ b/compiler/testData/repl/analyzeErrors.repl @@ -1,6 +1,6 @@ >>> fun foo() = 765 null >>> foo(1) -ERROR: /line2.ktscript: (1, 5) Too many arguments for internal final fun foo(): jet.Int defined in