diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.java index e35b760ecbe..6e22a24a788 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.java +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.java @@ -1,9 +1,4 @@ -/** - * @deprecated - */ -@java.lang.Deprecated -public final class _DefaultPackage { - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "NullableUnitReturnKt") +public final class NullableUnitReturnKt { @org.jetbrains.annotations.Nullable public static final kotlin.Unit foo() { /* compiled code */ } } \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt index ac605d0a0ae..a2b39a3b548 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt @@ -1,3 +1,3 @@ -// _DefaultPackage +// NullableUnitReturnKt fun foo(): Unit? = null \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.java index 5ba0dda0c7e..dbddc2628d6 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.java +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.java @@ -1,8 +1,3 @@ -/** - * @deprecated - */ -@java.lang.Deprecated -public final class _DefaultPackage { - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "UnitParameterKt") +public final class UnitParameterKt { public static final void foo(@org.jetbrains.annotations.NotNull kotlin.Unit s) { /* compiled code */ } } \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt index b417517b964..9b2009edf2b 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt @@ -1,3 +1,3 @@ -// _DefaultPackage +// UnitParameterKt fun foo(s: Unit) {} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.java index 032705fef7e..9039d39c9b6 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.java +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.java @@ -1,8 +1,3 @@ -/** - * @deprecated - */ -@java.lang.Deprecated -public final class _DefaultPackage { - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "VoidReturnKt") - public static final void foo(@org.jetbrains.annotations.NotNull java.lang.String g) { /* compiled code */ } +public final class VoidReturnKt { + public static final void foo(@org.jetbrains.annotations.NotNull java.lang.String s) { /* compiled code */ } } \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt index c2e5b586d2b..a5dabdd9acb 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt @@ -1,3 +1,3 @@ -// _DefaultPackage +// VoidReturnKt fun foo(g: String) {} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.java index bd489f2046b..347f07a2eae 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.java +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.java @@ -1,81 +1,72 @@ -/** - * @deprecated - */ -@java.lang.Deprecated -public final class _DefaultPackage { - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt") +public final class _DefaultPackageKt { + @org.jetbrains.annotations.Nullable + static final java.lang.String nullableVal = ""; + @org.jetbrains.annotations.Nullable + static java.lang.String nullableVar; + @org.jetbrains.annotations.NotNull + static final java.lang.String notNullVal = ""; + @org.jetbrains.annotations.NotNull + static java.lang.String notNullVar; + @org.jetbrains.annotations.NotNull + static final java.lang.String privateNn = ""; + @org.jetbrains.annotations.Nullable + static final java.lang.String privateN = ""; + + @org.jetbrains.annotations.NotNull + public static final java.lang.String notNull(@org.jetbrains.annotations.NotNull java.lang.String a) { /* compiled code */ } + + @org.jetbrains.annotations.Nullable + public static final java.lang.String nullable(@org.jetbrains.annotations.Nullable java.lang.String a) { /* compiled code */ } + + @org.jetbrains.annotations.NotNull + public static final java.lang.String notNullWithNN() { /* compiled code */ } + + @org.jetbrains.annotations.Nullable + @org.jetbrains.annotations.NotNull + public static final java.lang.String notNullWithN() { /* compiled code */ } + + @org.jetbrains.annotations.Nullable + public static final java.lang.String nullableWithN() { /* compiled code */ } + + @org.jetbrains.annotations.NotNull + @org.jetbrains.annotations.Nullable + public static final java.lang.String nullableWithNN() { /* compiled code */ } + + @org.jetbrains.annotations.Nullable + public static final java.lang.String getNullableVal() { /* compiled code */ } + + @org.jetbrains.annotations.Nullable + public static final java.lang.String getNullableVar() { /* compiled code */ } + + public static final void setNullableVar(@org.jetbrains.annotations.Nullable java.lang.String p) { /* compiled code */ } + @org.jetbrains.annotations.NotNull public static final java.lang.String getNotNullVal() { /* compiled code */ } - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt") + @org.jetbrains.annotations.NotNull + public static final java.lang.String getNotNullVar() { /* compiled code */ } + + public static final void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ } + @org.jetbrains.annotations.Nullable @org.jetbrains.annotations.NotNull public static final java.lang.String getNotNullValWithGet() { /* compiled code */ } - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt") - @org.jetbrains.annotations.NotNull - public static final java.lang.String getNotNullVar() { /* compiled code */ } - - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt") - public static final void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ } - - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt") - @org.jetbrains.annotations.Nullable - @org.jetbrains.annotations.NotNull - public static final java.lang.String getNotNullVarWithGetSet() { /* compiled code */ } - - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt") - @org.jetbrains.annotations.Nullable - public static final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull java.lang.String v) { /* compiled code */ } - - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt") - @org.jetbrains.annotations.Nullable - public static final java.lang.String getNullableVal() { /* compiled code */ } - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt") @org.jetbrains.annotations.NotNull @org.jetbrains.annotations.Nullable public static final java.lang.String getNullableValWithGet() { /* compiled code */ } - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt") - @org.jetbrains.annotations.Nullable - public static final java.lang.String getNullableVar() { /* compiled code */ } - - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt") - public static final void setNullableVar(@org.jetbrains.annotations.Nullable java.lang.String p) { /* compiled code */ } - - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt") @org.jetbrains.annotations.NotNull @org.jetbrains.annotations.Nullable public static final java.lang.String getNullableVarWithGetSet() { /* compiled code */ } - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt") @org.jetbrains.annotations.NotNull public static final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable java.lang.String v) { /* compiled code */ } - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt") @org.jetbrains.annotations.NotNull - public static final java.lang.String notNull(@org.jetbrains.annotations.NotNull java.lang.String a) { /* compiled code */ } + static final java.lang.String getPrivateNn() { /* compiled code */ } - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt") - @org.jetbrains.annotations.Nullable - @org.jetbrains.annotations.NotNull - public static final java.lang.String notNullWithN() { /* compiled code */ } - - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt") - @org.jetbrains.annotations.NotNull - public static final java.lang.String notNullWithNN() { /* compiled code */ } - - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt") - @org.jetbrains.annotations.Nullable - public static final java.lang.String nullable(@org.jetbrains.annotations.Nullable java.lang.String a) { /* compiled code */ } - - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt") - @org.jetbrains.annotations.Nullable - public static final java.lang.String nullableWithN() { /* compiled code */ } - - @kotlin.jvm.internal.KotlinDelegatedMethod(implementationClassName = "_DefaultPackageKt") - @org.jetbrains.annotations.NotNull @org.jetbrains.annotations.Nullable public static final java.lang.String nullableWithNN() { /* compiled code */ } } \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.kt index 7df1bd0ce7e..2c2a02c9dab 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.kt +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.kt @@ -1,4 +1,4 @@ -// _DefaultPackage +// _DefaultPackageKt import org.jetbrains.annotations.NotNull import org.jetbrains.annotations.Nullable diff --git a/compiler/testData/cli/jvm/classAndFacadeClash.out b/compiler/testData/cli/jvm/classAndFacadeClash.out index 248299908d4..a0aba9318ad 100644 --- a/compiler/testData/cli/jvm/classAndFacadeClash.out +++ b/compiler/testData/cli/jvm/classAndFacadeClash.out @@ -1,4 +1 @@ -compiler/testData/cli/jvm/classAndFacadeClash.kt:3:1: error: duplicate JVM class name 'test/TestPackage' generated from: package-fragment test, TestPackage -class TestPackage { -^ -COMPILATION_ERROR \ No newline at end of file +OK \ No newline at end of file diff --git a/compiler/testData/cli/jvm/fileClassAndFacadeClash.out b/compiler/testData/cli/jvm/fileClassAndFacadeClash.out index 4cea603dff3..a0aba9318ad 100644 --- a/compiler/testData/cli/jvm/fileClassAndFacadeClash.out +++ b/compiler/testData/cli/jvm/fileClassAndFacadeClash.out @@ -1,4 +1 @@ -compiler/testData/cli/jvm/fileClassAndFacadeClash.kt:1:1: error: duplicate JVM class name 'test/TestPackage' generated from: package-fragment test, package-fragment test -@file:JvmName("TestPackage") -^ -COMPILATION_ERROR \ No newline at end of file +OK \ No newline at end of file diff --git a/compiler/testData/cli/jvm/signatureClash.out b/compiler/testData/cli/jvm/signatureClash.out index 3c8e1e95f9f..bd85247ba89 100644 --- a/compiler/testData/cli/jvm/signatureClash.out +++ b/compiler/testData/cli/jvm/signatureClash.out @@ -14,13 +14,13 @@ compiler/testData/cli/jvm/signatureClash.kt:9:5: error: platform declaration cla val a: Int = 1 ^ compiler/testData/cli/jvm/signatureClash.kt:12:1: error: platform declaration clash: The following declarations have the same JVM signature (getB()I): - fun (): kotlin.Int fun getB(): kotlin.Int + fun (): kotlin.Int fun getB(): Int = 1 ^ compiler/testData/cli/jvm/signatureClash.kt:13:1: error: platform declaration clash: The following declarations have the same JVM signature (getB()I): - fun (): kotlin.Int fun getB(): kotlin.Int + fun (): kotlin.Int val b: Int = 1 ^ compiler/testData/cli/jvm/signatureClash.kt:19:7: error: platform declaration clash: The following declarations have the same JVM signature (getTr()I): diff --git a/compiler/testData/compileJavaAgainstKotlin/class/StarProjection.java b/compiler/testData/compileJavaAgainstKotlin/class/StarProjection.java index 101760f68e0..0c07a5a4a48 100644 --- a/compiler/testData/compileJavaAgainstKotlin/class/StarProjection.java +++ b/compiler/testData/compileJavaAgainstKotlin/class/StarProjection.java @@ -3,7 +3,7 @@ package test; public class StarProjection { void foo(K k) { k.foo(null); - TestPackage.bar(null); + StarProjectionKt.bar(null); new Sub().foo(null); } } \ No newline at end of file diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Any.java b/compiler/testData/compileJavaAgainstKotlin/method/Any.java index 2ac8ac590ce..2181e6303ec 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/Any.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/Any.java @@ -2,6 +2,6 @@ package test; class Any { { - Object r = TestPackage.anyany(new Object(), null); + Object r = AnyKt.anyany(new Object(), null); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.java b/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.java index e0875144259..551dd3c0b52 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.java @@ -4,6 +4,6 @@ package test; class ArrayOfIntArray { { int[][] a = new int[0][]; - int[][] r = TestPackage.ohMy(a); + int[][] r = ArrayOfIntArrayKt.ohMy(a); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.java b/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.java index c1c801e6164..de17bd4d4d8 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.java @@ -4,6 +4,6 @@ package test; class ArrayOfIntArray { { Integer[][] a = new Integer[0][]; - Integer[][] r = TestPackage.ohMy(a, null); + Integer[][] r = ArrayOfIntegerArrayKt.ohMy(a, null); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Extensions.java b/compiler/testData/compileJavaAgainstKotlin/method/Extensions.java index 70daa575cdd..cfcd1ca6b82 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/Extensions.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/Extensions.java @@ -2,8 +2,8 @@ package test; class GenericArray { { - TestPackage.noParam(""); + ExtensionsKt.noParam(""); - TestPackage.param("", ""); + ExtensionsKt.param("", ""); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/GenericArray.java b/compiler/testData/compileJavaAgainstKotlin/method/GenericArray.java index 5dd08cc06a0..3d53aa67793 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/GenericArray.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/GenericArray.java @@ -2,6 +2,6 @@ package test; class GenericArray { public static void ggff() { - String[] s = TestPackage.ffgg(new String[0]); + String[] s = GenericArrayKt.ffgg(new String[0]); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Hello.java b/compiler/testData/compileJavaAgainstKotlin/method/Hello.java index fed36689177..dee73aa8a59 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/Hello.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/Hello.java @@ -3,6 +3,6 @@ package test; class Hello { public static void xx() { - String s = TestPackage.f(); + String s = HelloKt.f(); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Int.java b/compiler/testData/compileJavaAgainstKotlin/method/Int.java index d75ff1da24e..b74ef85d0d3 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/Int.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/Int.java @@ -3,6 +3,6 @@ package test; class Int { { - int r = TestPackage.lll(1); + int r = IntKt.lll(1); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/IntArray.java b/compiler/testData/compileJavaAgainstKotlin/method/IntArray.java index 8166cdacfb4..f449aae931c 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/IntArray.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/IntArray.java @@ -3,6 +3,6 @@ package test; class IntArray { { - int[] r = TestPackage.doNothing(new int[0], null); + int[] r = IntArrayKt.doNothing(new int[0], null); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.java b/compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.java index cbaeaaf51db..2c1ed04b3b2 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.java @@ -3,6 +3,6 @@ package test; class IntWithDefault { { - int r = TestPackage.www(1); + int r = IntWithDefaultKt.www(1); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.java b/compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.java index 271eff04aba..e583b22ea07 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.java @@ -3,6 +3,6 @@ package test; class IntArray { { - Integer[] r = TestPackage.doNothing(new Integer[0], null); + Integer[] r = IntegerArrayKt.doNothing(new Integer[0], null); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.java b/compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.java index 7c459b73c7c..b565ae1b6f5 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.java @@ -7,7 +7,7 @@ class ListOfInt { public static void hhh() { List list = new ArrayList(); - List r = TestPackage.ggg(list); + List r = ListOfIntKt.ggg(list); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/ListOfString.java b/compiler/testData/compileJavaAgainstKotlin/method/ListOfString.java index b1d46afa1ba..15df88682f9 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/ListOfString.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/ListOfString.java @@ -6,6 +6,6 @@ import java.util.ArrayList; class ListString { public static void gg() { List list = new ArrayList(); - TestPackage.ff(list); + ListOfStringKt.ff(list); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/ListOfT.java b/compiler/testData/compileJavaAgainstKotlin/method/ListOfT.java index 9f2191241da..8e37d4be6f0 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/ListOfT.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/ListOfT.java @@ -7,7 +7,7 @@ class ListOfT { public static void check() { List list = new ArrayList(); - List r = TestPackage.listOfT(list); + List r = ListOfTKt.listOfT(list); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.java b/compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.java index 2b152f74f5e..532e302513d 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.java @@ -8,6 +8,6 @@ class MapOfKString { public static void gfgdgfg() { Map map = new HashMap(); - Map r = TestPackage.fff(map); + Map r = MapOfKStringKt.fff(map); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.java b/compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.java index fa82d8c0187..aa5ef151ba2 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.java @@ -8,6 +8,6 @@ class MapOfKString { public static void gfgdgfg() { Map map = new HashMap(); - Map r = TestPackage.fff(map); + Map r = MapOfStringIntQKt.fff(map); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.java b/compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.java index 14d2cf5b935..eb7c51d2818 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.java @@ -4,6 +4,6 @@ class Question { // id2 is to prevent java type parameter type inference static T id2(T p) { return p; } { - java.util.List s = id2(TestPackage.id(null)); + java.util.List s = id2(QExtendsListStringKt.id(null)); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.java b/compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.java index 16e6c24ea6d..ff791c1ae71 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.java @@ -4,6 +4,6 @@ class Question { // id2 is to prevent java type parameter type inference static T id2(T p) { return p; } { - String s = id2(TestPackage.id(null)); + String s = id2(QExtendsStringKt.id(null)); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Vararg.java b/compiler/testData/compileJavaAgainstKotlin/method/Vararg.java index 32537501afe..9e182d90201 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/Vararg.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/Vararg.java @@ -6,6 +6,6 @@ import java.util.ArrayList; class Vararg { { List list = new ArrayList(); - List r = TestPackage.gg(list, 3, 4, 5, 6); + List r = VarargKt.gg(list, 3, 4, 5, 6); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Void.java b/compiler/testData/compileJavaAgainstKotlin/method/Void.java index 9eb5f2d9e55..c9037873bab 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/Void.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/Void.java @@ -2,6 +2,6 @@ package test; class Void { { - TestPackage.f(); + VoidKt.f(); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.java b/compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.java index 73e221d4101..77069818fe4 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.java @@ -2,6 +2,6 @@ package test; public class PlatformName { public static void main(String[] args) { - TestPackage.bar(); + PlatformNameKt.bar(); } } \ No newline at end of file diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.java b/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.java index 0a439117e6d..df6fd7f1afd 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.java @@ -13,12 +13,12 @@ class JavaClass { catch (E1 e) {} try { - TestPackage.one(1); + DefaultArgsKt.one(1); } catch (E1 e) {} try { - TestPackage.one(); + DefaultArgsKt.one(); } catch (E1 e) {} } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.java b/compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.java index ff1ece6c9bd..7fadda0b7d7 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.java +++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.java @@ -2,15 +2,15 @@ package test; class JavaClass { void testMethod() { - TestPackage.none(); + TopLevelKt.none(); try { - TestPackage.one(); + TopLevelKt.one(); } catch (E1 e) {} try { - TestPackage.two(); + TopLevelKt.two(); } catch (E1 e) {} catch (E2 e) {} diff --git a/compiler/testData/compileJavaAgainstKotlin/property/Extensions.java b/compiler/testData/compileJavaAgainstKotlin/property/Extensions.java index edcc350ed20..0d6be7cc8d2 100644 --- a/compiler/testData/compileJavaAgainstKotlin/property/Extensions.java +++ b/compiler/testData/compileJavaAgainstKotlin/property/Extensions.java @@ -2,9 +2,9 @@ package test; class GenericArray { { - TestPackage.getVal_(""); + ExtensionsKt.getVal_(""); - TestPackage.getVar_(""); - TestPackage.setVar_("", ""); + ExtensionsKt.getVar_(""); + ExtensionsKt.setVar_("", ""); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.java b/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.java index 4dd6059f4df..a3bbcb2e402 100644 --- a/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.java +++ b/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.java @@ -2,6 +2,6 @@ package test; class GenericProperty { void foo() { - java.util.Map o = TestPackage.getTest(new java.util.HashMap()); + java.util.Map o = GenericPropertyKt.getTest(new java.util.HashMap()); } } diff --git a/compiler/testData/compileJavaAgainstKotlin/property/platformName/PlatformName.java b/compiler/testData/compileJavaAgainstKotlin/property/platformName/PlatformName.java index af1a5fbfcbc..14b7f03ee8e 100644 --- a/compiler/testData/compileJavaAgainstKotlin/property/platformName/PlatformName.java +++ b/compiler/testData/compileJavaAgainstKotlin/property/platformName/PlatformName.java @@ -2,7 +2,7 @@ package test; public class PlatformName { public static void main(String[] args) { - int x = TestPackage.vget(); - TestPackage.vset(0); + int x = PlatformNameKt.vget(); + PlatformNameKt.vset(0); } } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt index b0c6420a9c5..568f17314a3 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt @@ -1,5 +1,5 @@ // FILE: a.kt -val x = 1 +val x = 1 // FILE: b.kt -fun getX() = 1 \ No newline at end of file +fun getX() = 1 \ No newline at end of file diff --git a/compiler/testData/integration/ant/jvm/helloWorld/build.xml b/compiler/testData/integration/ant/jvm/helloWorld/build.xml index 23fc47d8f15..9337efb8c14 100644 --- a/compiler/testData/integration/ant/jvm/helloWorld/build.xml +++ b/compiler/testData/integration/ant/jvm/helloWorld/build.xml @@ -4,7 +4,7 @@ - + diff --git a/compiler/testData/integration/ant/jvm/jvmClasspath/build.xml b/compiler/testData/integration/ant/jvm/jvmClasspath/build.xml index 23fc47d8f15..9337efb8c14 100644 --- a/compiler/testData/integration/ant/jvm/jvmClasspath/build.xml +++ b/compiler/testData/integration/ant/jvm/jvmClasspath/build.xml @@ -4,7 +4,7 @@ - + diff --git a/compiler/testData/integration/ant/jvm/moduleName/build.xml b/compiler/testData/integration/ant/jvm/moduleName/build.xml index 4f4738428d1..7353e8dd374 100644 --- a/compiler/testData/integration/ant/jvm/moduleName/build.xml +++ b/compiler/testData/integration/ant/jvm/moduleName/build.xml @@ -4,7 +4,7 @@ - + diff --git a/compiler/testData/integration/ant/jvm/moduleNameDefault/build.xml b/compiler/testData/integration/ant/jvm/moduleNameDefault/build.xml index 23fc47d8f15..9337efb8c14 100644 --- a/compiler/testData/integration/ant/jvm/moduleNameDefault/build.xml +++ b/compiler/testData/integration/ant/jvm/moduleNameDefault/build.xml @@ -4,7 +4,7 @@ - + diff --git a/compiler/testData/integration/ant/jvm/moduleNameWithKotlin/build.xml b/compiler/testData/integration/ant/jvm/moduleNameWithKotlin/build.xml index 17a814907d3..529fc1b4c2f 100644 --- a/compiler/testData/integration/ant/jvm/moduleNameWithKotlin/build.xml +++ b/compiler/testData/integration/ant/jvm/moduleNameWithKotlin/build.xml @@ -10,7 +10,7 @@ - + diff --git a/compiler/testData/writeSignature/ArrayOfCharSequence.kt b/compiler/testData/writeSignature/ArrayOfCharSequence.kt index 62497664b62..6e487a15da7 100644 --- a/compiler/testData/writeSignature/ArrayOfCharSequence.kt +++ b/compiler/testData/writeSignature/ArrayOfCharSequence.kt @@ -1,5 +1,5 @@ fun never(): Array = throw Exception() -// method: _DefaultPackage::never +// method: ArrayOfCharSequenceKt::never // jvm signature: ()[Ljava/lang/CharSequence; // generic signature: null \ No newline at end of file diff --git a/compiler/testData/writeSignature/ArrayOfInt.kt b/compiler/testData/writeSignature/ArrayOfInt.kt index c899b70a36f..c233df666fe 100644 --- a/compiler/testData/writeSignature/ArrayOfInt.kt +++ b/compiler/testData/writeSignature/ArrayOfInt.kt @@ -1,5 +1,5 @@ fun never(): Array = throw Exception() -// method: _DefaultPackage::never +// method: ArrayOfIntKt::never // jvm signature: ()[Ljava/lang/Integer; // generic signature: null diff --git a/compiler/testData/writeSignature/Comparable.kt b/compiler/testData/writeSignature/Comparable.kt index 9273cbbb157..208fa503a8b 100644 --- a/compiler/testData/writeSignature/Comparable.kt +++ b/compiler/testData/writeSignature/Comparable.kt @@ -1,5 +1,5 @@ fun cc(): Comparable? = null -// method: _DefaultPackage::cc +// method: ComparableKt::cc // jvm signature: ()Ljava/lang/Comparable; // generic signature: ()Ljava/lang/Comparable; diff --git a/compiler/testData/writeSignature/Int.kt b/compiler/testData/writeSignature/Int.kt index bd2e3ccf3da..39ae74782c1 100644 --- a/compiler/testData/writeSignature/Int.kt +++ b/compiler/testData/writeSignature/Int.kt @@ -1,5 +1,5 @@ fun key(): Int = throw Exception() -// method: _DefaultPackage::key +// method: IntKt::key // jvm signature: ()I // generic signature: null \ No newline at end of file diff --git a/compiler/testData/writeSignature/IntArray.kt b/compiler/testData/writeSignature/IntArray.kt index 26248ad10f0..aed132dd1d4 100644 --- a/compiler/testData/writeSignature/IntArray.kt +++ b/compiler/testData/writeSignature/IntArray.kt @@ -1,5 +1,5 @@ fun never(): IntArray = throw Exception() -// method: _DefaultPackage::never +// method: IntArrayKt::never // jvm signature: ()[I // generic signature: null \ No newline at end of file diff --git a/compiler/testData/writeSignature/IntQ.kt b/compiler/testData/writeSignature/IntQ.kt index fa1e1e7d586..1add12f582d 100644 --- a/compiler/testData/writeSignature/IntQ.kt +++ b/compiler/testData/writeSignature/IntQ.kt @@ -1,5 +1,5 @@ fun sometimes(): Int? = null -// method: _DefaultPackage::sometimes +// method: IntQKt::sometimes // jvm signature: ()Ljava/lang/Integer; // generic signature: null \ No newline at end of file diff --git a/compiler/testData/writeSignature/ListOfCharSequence.kt b/compiler/testData/writeSignature/ListOfCharSequence.kt index da0f45f8c1c..fa0e8b416f5 100644 --- a/compiler/testData/writeSignature/ListOfCharSequence.kt +++ b/compiler/testData/writeSignature/ListOfCharSequence.kt @@ -1,6 +1,6 @@ fun foo(p: List) = 1 -// method: _DefaultPackage::foo +// method: ListOfCharSequenceKt::foo // jvm signature: (Ljava/util/List;)I // generic signature: (Ljava/util/List<+Ljava/lang/CharSequence;>;)I \ No newline at end of file diff --git a/compiler/testData/writeSignature/ListOfStar.kt b/compiler/testData/writeSignature/ListOfStar.kt index 0b7b35221a0..50926a3aec2 100644 --- a/compiler/testData/writeSignature/ListOfStar.kt +++ b/compiler/testData/writeSignature/ListOfStar.kt @@ -1,6 +1,6 @@ fun listOfStar(): List<*> = throw Exception() -// method: _DefaultPackage::listOfStar +// method: ListOfStarKt::listOfStar // jvm signature: ()Ljava/util/List; // generic signature: ()Ljava/util/List<*>; \ No newline at end of file diff --git a/compiler/testData/writeSignature/MapEntry.kt b/compiler/testData/writeSignature/MapEntry.kt index e65843ae8a2..f6601d2acd0 100644 --- a/compiler/testData/writeSignature/MapEntry.kt +++ b/compiler/testData/writeSignature/MapEntry.kt @@ -1,5 +1,5 @@ fun getEntry(): Map.Entry? = null -// method: _DefaultPackage::getEntry +// method: MapEntryKt::getEntry // jvm signature: ()Ljava/util/Map$Entry; // generic signature: ()Ljava/util/Map$Entry; \ No newline at end of file diff --git a/compiler/testData/writeSignature/MutableMapEntry.kt b/compiler/testData/writeSignature/MutableMapEntry.kt index 4eb00690181..b9a303d4863 100644 --- a/compiler/testData/writeSignature/MutableMapEntry.kt +++ b/compiler/testData/writeSignature/MutableMapEntry.kt @@ -1,5 +1,5 @@ fun getEntry(): MutableMap.MutableEntry? = null -// method: _DefaultPackage::getEntry +// method: MutableMapEntryKt::getEntry // jvm signature: ()Ljava/util/Map$Entry; // generic signature: ()Ljava/util/Map$Entry; \ No newline at end of file diff --git a/compiler/testData/writeSignature/NonGeneric.kt b/compiler/testData/writeSignature/NonGeneric.kt index d01036fbfdd..f1eb907a312 100644 --- a/compiler/testData/writeSignature/NonGeneric.kt +++ b/compiler/testData/writeSignature/NonGeneric.kt @@ -1,5 +1,5 @@ fun foo() = 1 -// method: _DefaultPackage::foo +// method: NonGenericKt::foo // jvm signature: ()I // generic signature: null \ No newline at end of file diff --git a/compiler/testData/writeSignature/StarProjectionOutsideClass.kt b/compiler/testData/writeSignature/StarProjectionOutsideClass.kt index 9712bbf76bd..6f30c86d92b 100644 --- a/compiler/testData/writeSignature/StarProjectionOutsideClass.kt +++ b/compiler/testData/writeSignature/StarProjectionOutsideClass.kt @@ -2,6 +2,6 @@ class C> fun bar(c: C<*>): C<*> = null!! -// method: _DefaultPackage::bar +// method: StarProjectionOutsideClassKt::bar // jvm signature: (LC;)LC; // generic signature: (LC<*>;)LC<*>; \ No newline at end of file diff --git a/compiler/testData/writeSignature/VarargCharSequence.kt b/compiler/testData/writeSignature/VarargCharSequence.kt index 2a8a03f2055..1bb37aabd84 100644 --- a/compiler/testData/writeSignature/VarargCharSequence.kt +++ b/compiler/testData/writeSignature/VarargCharSequence.kt @@ -1,5 +1,5 @@ fun foo(vararg tail: java.lang.CharSequence) = 1 -// method: _DefaultPackage::foo +// method: VarargCharSequenceKt::foo // jvm signature: ([Ljava/lang/CharSequence;)I // generic signature: null \ No newline at end of file diff --git a/compiler/testData/writeSignature/VarargGeneric.kt b/compiler/testData/writeSignature/VarargGeneric.kt index 3e1ae98b51c..cc6687850d9 100644 --- a/compiler/testData/writeSignature/VarargGeneric.kt +++ b/compiler/testData/writeSignature/VarargGeneric.kt @@ -1,5 +1,5 @@ fun

foo(vararg tail: P) = 1 -// method: _DefaultPackage::foo +// method: VarargGenericKt::foo // jvm signature: ([Ljava/lang/Object;)I // generic signature: ([TP;)I \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/FunctionTwoTypeParameters.kt b/compiler/testData/writeSignature/declarationSiteVariance/FunctionTwoTypeParameters.kt index 98e5916b5a2..3c63408c4e9 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/FunctionTwoTypeParameters.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/FunctionTwoTypeParameters.kt @@ -4,6 +4,6 @@ class X fun f(m: M): M = throw Exception() -// method: _DefaultPackage::f +// method: FunctionTwoTypeParametersKt::f // jvm signature: (LM;)LM; // generic signature: (LM<-LX;+LX;>;)LM; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/InInInPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/InInInPosition.kt index d961443b37b..3d81af4078f 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/InInInPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/InInInPosition.kt @@ -2,6 +2,6 @@ class In fun f(p: In) {} -// method: _DefaultPackage::f +// method: InInInPositionKt::f // jvm signature: (LIn;)V // generic signature: (LIn<-Ljava/lang/String;>;)V \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/InInOutPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/InInOutPosition.kt index 2e5a8e18e81..8ae5bc3be37 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/InInOutPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/InInOutPosition.kt @@ -2,6 +2,6 @@ class In fun f(): In = throw Exception() -// method: _DefaultPackage::f +// method: InInOutPositionKt::f // jvm signature: ()LIn; // generic signature: ()LIn; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/InOfInInInPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/InOfInInInPosition.kt index 240a961fd55..81f81f28b5b 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/InOfInInInPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/InOfInInInPosition.kt @@ -3,6 +3,6 @@ class X fun f(p: In>) {} -// method: _DefaultPackage::f +// method: InOfInInInPositionKt::f // jvm signature: (LIn;)V // generic signature: (LIn<-LIn<-LX;>;>;)V \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/InOfInInOutPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/InOfInInOutPosition.kt index 2116a1be139..374babdbc8c 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/InOfInInOutPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/InOfInInOutPosition.kt @@ -3,6 +3,6 @@ class X fun f(): In> = throw Exception() -// method: _DefaultPackage::f +// method: InOfInInOutPositionKt::f // jvm signature: ()LIn; // generic signature: ()LIn;>; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/InOfOutInInPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/InOfOutInInPosition.kt index e601a8eb527..ba4bd7e0f09 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/InOfOutInInPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/InOfOutInInPosition.kt @@ -4,6 +4,6 @@ class X fun f(p: In>) {} -// method: _DefaultPackage::f +// method: InOfOutInInPositionKt::f // jvm signature: (LIn;)V // generic signature: (LIn<-LOut<+LX;>;>;)V \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/InOfOutInOutPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/InOfOutInOutPosition.kt index e57d6a3030f..4a0304dd00b 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/InOfOutInOutPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/InOfOutInOutPosition.kt @@ -4,6 +4,6 @@ class X fun f(): In> = throw Exception() -// method: _DefaultPackage::f +// method: InOfOutInOutPositionKt::f // jvm signature: ()LIn; // generic signature: ()LIn;>; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/OutInInPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/OutInInPosition.kt index bdfccd70cfe..de45c33270a 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/OutInInPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/OutInInPosition.kt @@ -1,5 +1,5 @@ fun f(p: List) {} -// method: _DefaultPackage::f +// method: OutInInPositionKt::f // jvm signature: (Ljava/util/List;)V // generic signature: (Ljava/util/List<+Ljava/lang/String;>;)V \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/OutInOutPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/OutInOutPosition.kt index 9a00fab8f2b..0a6c92877d4 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/OutInOutPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/OutInOutPosition.kt @@ -1,5 +1,5 @@ fun f(): List = throw Exception() -// method: _DefaultPackage::f +// method: OutInOutPositionKt::f // jvm signature: ()Ljava/util/List; // generic signature: ()Ljava/util/List; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/OutOfInInInPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/OutOfInInInPosition.kt index 99de791ea84..866102ca526 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/OutOfInInInPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/OutOfInInInPosition.kt @@ -4,6 +4,6 @@ class X fun f(p: Out>) {} -// method: _DefaultPackage::f +// method: OutOfInInInPositionKt::f // jvm signature: (LOut;)V // generic signature: (LOut<+LIn<-LX;>;>;)V \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/OutOfInInOutPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/OutOfInInOutPosition.kt index 4da1ff13852..aa975b65162 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/OutOfInInOutPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/OutOfInInOutPosition.kt @@ -4,6 +4,6 @@ class X fun f(): Out> = throw Exception() -// method: _DefaultPackage::f +// method: OutOfInInOutPositionKt::f // jvm signature: ()LOut; // generic signature: ()LOut;>; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInInPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInInPosition.kt index 1ef505b10dc..975a838160d 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInInPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInInPosition.kt @@ -3,6 +3,6 @@ class X fun f(p: Out>) {} -// method: _DefaultPackage::f +// method: OutOfOutInInPositionKt::f // jvm signature: (LOut;)V // generic signature: (LOut<+LOut<+LX;>;>;)V \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInOutPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInOutPosition.kt index 98715bab84e..8a053005788 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInOutPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInOutPosition.kt @@ -13,6 +13,6 @@ class X // thus removing the wildcard would be restricting the use of the return value of the method, and we don't want do this. fun f(): Out> = throw Exception() -// method: _DefaultPackage::f +// method: OutOfOutInOutPositionKt::f // jvm signature: ()LOut; // generic signature: ()LOut;>; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterIn.kt b/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterIn.kt index 37a9047544d..aa1c98d8c21 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterIn.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterIn.kt @@ -3,6 +3,6 @@ class X val p: M = throw Exception() -// method: _DefaultPackage::getP +// method: PropertyGetterInKt::getP // jvm signature: ()LM; // generic signature: ()LM; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterOut.kt b/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterOut.kt index 078bada95cc..23d89b9511d 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterOut.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterOut.kt @@ -3,6 +3,6 @@ class X val p: M = throw Exception() -// method: _DefaultPackage::getP +// method: PropertyGetterOutKt::getP // jvm signature: ()LM; // generic signature: ()LM; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterTwoParams.kt b/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterTwoParams.kt index b979f4def79..f1d5faed7cf 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterTwoParams.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterTwoParams.kt @@ -3,6 +3,6 @@ class X val p: M = throw Exception() -// method: _DefaultPackage::getP +// method: PropertyGetterTwoParamsKt::getP // jvm signature: ()LM; // generic signature: ()LM; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/PropertySetterIn.kt b/compiler/testData/writeSignature/declarationSiteVariance/PropertySetterIn.kt index aac08a65b25..ed507cf25f7 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/PropertySetterIn.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/PropertySetterIn.kt @@ -3,6 +3,6 @@ class X var p: M = throw Exception() -// method: _DefaultPackage::setP +// method: PropertySetterInKt::setP // jvm signature: (LM;)V // generic signature: (LM<-LX;>;)V \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/PropertySetterOut.kt b/compiler/testData/writeSignature/declarationSiteVariance/PropertySetterOut.kt index d72140ad4fd..064cfb223e2 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/PropertySetterOut.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/PropertySetterOut.kt @@ -3,6 +3,6 @@ class X var p: M = throw Exception() -// method: _DefaultPackage::setP +// method: PropertySetterOutKt::setP // jvm signature: (LM;)V // generic signature: (LM<+LX;>;)V \ No newline at end of file diff --git a/compiler/testData/writeSignature/jlString.kt b/compiler/testData/writeSignature/jlString.kt index 7ec8e761734..02df435e6a3 100644 --- a/compiler/testData/writeSignature/jlString.kt +++ b/compiler/testData/writeSignature/jlString.kt @@ -1,5 +1,5 @@ fun string(): java.lang.String = throw Exception() -// method: _DefaultPackage::string +// method: JlStringKt::string // jvm signature: ()Ljava/lang/String; // generic signature: null \ No newline at end of file diff --git a/compiler/testData/writeSignature/nothing/nothing.kt b/compiler/testData/writeSignature/nothing/nothing.kt index 24a1a9a2100..60147cc1408 100644 --- a/compiler/testData/writeSignature/nothing/nothing.kt +++ b/compiler/testData/writeSignature/nothing/nothing.kt @@ -1,6 +1,6 @@ class C fun f(p: Nothing, p1: C, p2: C>, p3: C>?): Nothing = throw Exception() -// method: _DefaultPackage::f +// method: NothingKt::f // jvm signature: (Ljava/lang/Void;LC;LC;LC;)Ljava/lang/Void; // generic signature: null diff --git a/compiler/testData/writeSignature/nothing/nullableNothing.kt b/compiler/testData/writeSignature/nothing/nullableNothing.kt index e79e3847324..88e219f8360 100644 --- a/compiler/testData/writeSignature/nothing/nullableNothing.kt +++ b/compiler/testData/writeSignature/nothing/nullableNothing.kt @@ -1,6 +1,6 @@ class C fun f(p: Nothing?, p1: C, p2: C>, p3: C>?): Nothing? = throw Exception() -// method: _DefaultPackage::f +// method: NullableNothingKt::f // jvm signature: (Ljava/lang/Void;LC;LC;LC;)Ljava/lang/Void; // generic signature: null diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java index 9d3f9c21521..cf1d8481e07 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java @@ -118,8 +118,8 @@ public class KotlinLightClassCoherenceTest extends KotlinAsJavaTestBase { } } - public void testPackage() throws Exception { - doTest("test.TestPackage"); + public void testFileFacade() throws Exception { + doTest("test.PackageKt"); } public void testNoModifiers() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java index 9afa98b65d9..f9e81434ced 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java @@ -163,7 +163,7 @@ public abstract class KotlinLightClassStructureTest extends KotlinAsJavaTestBase } public void testPackage() throws Exception { - checkModifiers("test.TestPackage", PUBLIC, FINAL, DEPRECATED); + checkModifiers("test.PackageKt", PUBLIC, FINAL); } } @@ -177,8 +177,8 @@ public abstract class KotlinLightClassStructureTest extends KotlinAsJavaTestBase assertTrue(findMethodsOfClass("test.C").length == 2); } - public void testPackageWithErrors() { - assertTrue(findMethodsOfClass("test.TestPackage").length == 1); + public void testFileFacadeWithErrors() { + assertTrue(findMethodsOfClass("test.CodeWithErrorsKt").length == 1); } private PsiMethod[] findMethodsOfClass(String qualifiedName) { diff --git a/compiler/tests/org/jetbrains/kotlin/cli/CliCommonTest.java b/compiler/tests/org/jetbrains/kotlin/cli/CliCommonTest.java index c7c2137f954..506db316c92 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/CliCommonTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/CliCommonTest.java @@ -38,14 +38,14 @@ public class CliCommonTest extends CliBaseTest { public void simple() throws Exception { executeCompilerCompareOutputJVM(); - Assert.assertTrue(new File(tmpdir.getTmpDir(), PackageClassUtils.getPackageClassName(FqName.ROOT) + ".class").isFile()); + Assert.assertTrue(new File(tmpdir.getTmpDir(), "SimpleKt.class").isFile()); } @Test public void duplicateSources() throws Exception { executeCompilerCompareOutputJVM(); - Assert.assertTrue(new File(tmpdir.getTmpDir(), PackageClassUtils.getPackageClassName(FqName.ROOT) + ".class").isFile()); + Assert.assertTrue(new File(tmpdir.getTmpDir(), "SimpleKt.class").isFile()); } @Test diff --git a/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java b/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java index 462ed6af197..f27a0b7ac59 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java @@ -44,7 +44,7 @@ public class K2JvmCliTest extends CliBaseTest { public void nonExistingClassPathAndAnnotationsPath() throws Exception { executeCompilerCompareOutputJVM(); - Assert.assertTrue(new File(tmpdir.getTmpDir(), PackageClassUtils.getPackageClassName(FqName.ROOT) + ".class").isFile()); + Assert.assertTrue(new File(tmpdir.getTmpDir(), "SimpleKt.class").isFile()); } @Test diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt index 05b05a59eb8..efe9d62672f 100644 --- a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt @@ -103,7 +103,7 @@ public class CompilerDaemonTest : KotlinIntegrationTestBase() { TestCase.assertTrue("Expecting that compilation 1 ($compileTime1 ms) is at least two times longer than compilation 2 ($compileTime2 ms)", compileTime1 > compileTime2 * 2) logFile.delete() - run("hello.run", "-cp", jar, "Hello.HelloPackage") + run("hello.run", "-cp", jar, "Hello.HelloKt") } finally { if (!daemonShotDown) diff --git a/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java index bda10b3a53b..357f0147a64 100644 --- a/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java +++ b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java @@ -51,21 +51,21 @@ public class CompilerSmokeTest extends KotlinIntegrationTestBase { String jar = tmpdir.getAbsolutePath() + File.separator + "hello.jar"; assertEquals("compilation failed", 0, runCompiler("hello.compile", "-include-runtime", "hello.kt", "-d", jar)); - run("hello.run", "-cp", jar, "Hello.HelloPackage"); + run("hello.run", "-cp", jar, "Hello.HelloKt"); } public void testHelloAppFQMain() throws Exception { String jar = tmpdir.getAbsolutePath() + File.separator + "hello.jar"; assertEquals("compilation failed", 0, runCompiler("hello.compile", "-include-runtime", "hello.kt", "-d", jar)); - run("hello.run", "-cp", jar, "Hello.HelloPackage"); + run("hello.run", "-cp", jar, "Hello.HelloKt"); } public void testHelloAppVarargMain() throws Exception { String jar = tmpdir.getAbsolutePath() + File.separator + "hello.jar"; assertEquals("compilation failed", 0, runCompiler("hello.compile", "-include-runtime", "hello.kt", "-d", jar)); - run("hello.run", "-cp", jar, "Hello.HelloPackage"); + run("hello.run", "-cp", jar, "Hello.HelloKt"); } public void testCompilationFailed() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstInlineKotlinTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstInlineKotlinTest.kt index f3c412f8545..9519cbe3eda 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstInlineKotlinTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstInlineKotlinTest.kt @@ -49,7 +49,7 @@ public abstract class AbstractCompileKotlinAgainstInlineKotlinTest : AbstractCom try { factory1 = compileA(File(files[1])) factory2 = compileB(File(files[0])) - invokeBox() + invokeBox(files[0]) } catch (e: Throwable) { var result = "" diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java index e2d389732a2..2cadb539eee 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java @@ -30,8 +30,7 @@ import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.load.kotlin.ModuleVisibilityManager; -import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; -import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.JetTestUtils; @@ -59,29 +58,31 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends TestCaseWit public void doTest(@NotNull String fileName) throws Exception { compileA(new File(fileName)); - compileB(new File(fileName.replaceFirst("A\\.kt$", "B.kt"))); - invokeMain(); + String fileNameB = fileName.replaceFirst("A\\.kt$", "B.kt"); + compileB(new File(fileNameB)); + invokeMain(fileNameB); } - private void invokeMain() throws Exception { - Method main = generatedClass().getMethod("main", String[].class); + private void invokeMain(@NotNull String fileName) throws Exception { + Method main = generatedClass(fileName).getMethod("main", String[].class); main.invoke(null, new Object[] {ArrayUtil.EMPTY_STRING_ARRAY}); } - protected void invokeBox() throws Exception { - Method box = generatedClass().getMethod("box"); + protected void invokeBox(@NotNull String fileName) throws Exception { + Method box = generatedClass(fileName).getMethod("box"); String result = (String) box.invoke(null); assertEquals("OK", result); } @NotNull - private Class generatedClass() throws Exception { + private Class generatedClass(@NotNull String fileName) throws Exception { URLClassLoader classLoader = new URLClassLoader( new URL[]{ bDir.toURI().toURL(), aDir.toURI().toURL() }, ForTestCompileRuntime.runtimeAndReflectJarClassLoader() ); - return classLoader.loadClass(PackageClassUtils.getPackageClassName(FqName.ROOT)); + String fileLastName = new File(fileName).getName(); + return classLoader.loadClass(PackagePartClassUtils.getFilePartShortName(fileLastName)); } protected ClassFileFactory compileA(@NotNull File ktAFile) throws IOException { diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstMultifileKotlinTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstMultifileKotlinTest.kt index 62b700653f7..c63d063cd73 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstMultifileKotlinTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstMultifileKotlinTest.kt @@ -37,7 +37,7 @@ public abstract class AbstractCompileKotlinAgainstMultifileKotlinTest : Abstract try { factory1 = compileA(File(files[1])) factory2 = compileB(File(files[0])) - invokeBox() + invokeBox(files[0]) } catch (e: Throwable) { var result = "" diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java index 599a7085e47..52a2183cadb 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java @@ -46,8 +46,8 @@ public class CompileEnvironmentTest extends TestCase { File[] files = out.listFiles(); Arrays.sort(files); assertEquals(2, files.length); - assertEquals(1, files[0].listFiles().length);//META-INF - assertEquals(2, files[1].listFiles().length);//Smoke package + assertEquals(1, files[0].listFiles().length); //META-INF + assertEquals(1, files[1].listFiles().length); // SmokeKt } finally { FileUtil.delete(tempDir); diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt index a08c74f6d60..85afd847a42 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt @@ -140,13 +140,17 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi val packageScopes = arrayListOf() val classes = arrayListOf() + var shouldAddPackageView = false for (classFile in allClassFiles) { val className = classFile.relativeTo(tmpdir).substringBeforeLast(".class").replace('/', '.').replace('\\', '.') val klass = classLoader.loadClass(className).sure { "Couldn't load class $className" } val header = ReflectKotlinClass.create(klass)?.getClassHeader() - if (header?.kind == KotlinClassHeader.Kind.PACKAGE_FACADE || header?.kind == KotlinClassHeader.Kind.FILE_FACADE) { + if (header?.kind == KotlinClassHeader.Kind.PACKAGE_FACADE || + header?.kind == KotlinClassHeader.Kind.FILE_FACADE || + header?.kind == KotlinClassHeader.Kind.MULTIFILE_CLASS + ) { val packageView = module.getPackage(LoadDescriptorUtil.TEST_PACKAGE_FQNAME) if (!packageScopes.contains(packageView.memberScope)) { packageScopes.add(packageView.memberScope)