Change part class naming scheme

update tests depending on part class naming

compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.java

@@ -45,8 +45,12 @@ public class PackagePartClassUtils {
     }
 
     @NotNull
-    private static String replaceSpecialSymbols(@NotNull String str) {
+    private static String getSanitizedIdentifier(@NotNull String str) {
-        return str.replace('.', '_');
+        str = str.replaceAll("[^\\p{L}\\p{Digit}]", "_");
+        if (!Character.isJavaIdentifierStart(str.charAt(0))) {
+            str = "_" + str;
+        }
+        return str;
     }
 
     @NotNull
@@ -65,20 +69,10 @@ public class PackagePartClassUtils {
             if ('a' <= c && c <= 'z') {
                 fileName = Character.toUpperCase(fileName.charAt(0)) + fileName.substring(1);
             }
+            fileName += "Kt";
         }
 
-        if (jetFile != null) {
+        return facadeFqName.parent().child(Name.identifier(getSanitizedIdentifier(fileName)));
-            for (PsiElement child : jetFile.getDeclarations()) {
-                if (child instanceof JetClassOrObject) {
-                    if (fileName.equalsIgnoreCase(((JetClassOrObject) child).getName())) {
-                        fileName += "_";
-                        break;
-                    }
-                }
-            }
-        }
-
-        return facadeFqName.parent().child(Name.identifier(replaceSpecialSymbols(fileName)));
     }
 
     @NotNull

compiler/testData/checkLocalVariablesTable/itInLambda.kt

@@ -8,6 +8,6 @@ fun foo1() {
     }
 }
 
-// METHOD : _DefaultPackage*$foo1$1.invoke(I)V
+// METHOD : ItInLambdaKt$foo1$1.invoke(I)V
-// VARIABLE : NAME=this TYPE=L_DefaultPackage*$foo1$1; INDEX=0
+// VARIABLE : NAME=this TYPE=LItInLambdaKt$foo1$1; INDEX=0
 // VARIABLE : NAME=it TYPE=I INDEX=1

compiler/testData/checkLocalVariablesTable/itInReturnedLambda.kt

@@ -6,6 +6,6 @@ fun foo() {
     }
 }
 
-// METHOD : _DefaultPackage*$foo$1$1.invoke(I)V
+// METHOD : ItInReturnedLambdaKt$foo$1$1.invoke(I)V
-// VARIABLE : NAME=this TYPE=L_DefaultPackage*$foo$1$1; INDEX=0
+// VARIABLE : NAME=this TYPE=LItInReturnedLambdaKt$foo$1$1; INDEX=0
 // VARIABLE : NAME=it TYPE=I INDEX=1

compiler/testData/checkLocalVariablesTable/lambdaAsVar.kt

@@ -4,5 +4,5 @@ fun foo() {
     }
 }
 
-// METHOD : _DefaultPackage*$foo$a$1.invoke()V
+// METHOD : LambdaAsVarKt$foo$a$1.invoke()V
-// VARIABLE : NAME=this TYPE=L_DefaultPackage*$foo$a$1; INDEX=0
+// VARIABLE : NAME=this TYPE=LLambdaAsVarKt$foo$a$1; INDEX=0

compiler/testData/checkLocalVariablesTable/localFun.kt

@@ -3,5 +3,5 @@ fun foo() {
     }
 }
 
-// METHOD : _DefaultPackage*$foo$1.invoke()V
+// METHOD : LocalFunKt$foo$1.invoke()V
-// VARIABLE : NAME=this TYPE=L_DefaultPackage*$foo$1; INDEX=0
+// VARIABLE : NAME=this TYPE=LLocalFunKt$foo$1; INDEX=0

compiler/testData/cli/jvm/classAndPartClash.kt

@@ -1,13 +1,7 @@
 package test
 
-class ClassAndPartClash {
+class ClassAndPartClash
+class ClassAndPartClash_
+class ClassAndPartClashKt
 
-}
+fun z () {}
-
-class ClassAndPartClash_ {
-
-}
-
-fun z () {
-
-}

compiler/testData/cli/jvm/classAndPartClash.out

@@ -1,7 +1,7 @@
-compiler/testData/cli/jvm/classAndPartClash.kt:1:1: error: duplicate JVM class name 'test/ClassAndPartClash_' generated from: package-fragment test, ClassAndPartClash_
+compiler/testData/cli/jvm/classAndPartClash.kt:1:1: error: duplicate JVM class name 'test/ClassAndPartClashKt' generated from: package-fragment test, ClassAndPartClashKt
 package test
 ^
-compiler/testData/cli/jvm/classAndPartClash.kt:7:1: error: duplicate JVM class name 'test/ClassAndPartClash_' generated from: package-fragment test, ClassAndPartClash_
+compiler/testData/cli/jvm/classAndPartClash.kt:5:1: error: duplicate JVM class name 'test/ClassAndPartClashKt' generated from: package-fragment test, ClassAndPartClashKt
-class ClassAndPartClash_ {
+class ClassAndPartClashKt
 ^
 COMPILATION_ERROR

compiler/testData/cli/jvm/sanitized-name.clash.args

@@ -0,0 +1,3 @@
+$TESTDATA_DIR$/sanitized-name.clash.kt
+-d
+$TEMP_DIR$

compiler/testData/cli/jvm/sanitized-name.clash.kt

@@ -0,0 +1,5 @@
+class SanitizedNameClash
+class Sanitized_Name_Clash
+class Sanitized_name_clashKt
+
+fun foo() {}

compiler/testData/cli/jvm/sanitized-name.clash.out

@@ -0,0 +1,7 @@
+compiler/testData/cli/jvm/sanitized-name.clash.kt:1:1: error: duplicate JVM class name 'Sanitized_name_clashKt' generated from: package-fragment , Sanitized_name_clashKt
+class SanitizedNameClash
+^
+compiler/testData/cli/jvm/sanitized-name.clash.kt:3:1: error: duplicate JVM class name 'Sanitized_name_clashKt' generated from: package-fragment , Sanitized_name_clashKt
+class Sanitized_name_clashKt
+^
+COMPILATION_ERROR

compiler/testData/codegen/boxInline/smap/anonymous/lambda.1.kt

@@ -23,9 +23,9 @@ fun box(): String {
 //*S Kotlin
 //*F
 //+ 1 lambda.1.kt
-//_DefaultPackage
+//Lambda_1Kt
 //+ 2 lambda.2.kt
-//builders/BuildersPackage
+//builders/Lambda_2Kt
 //*L
 //1#1,46:1
 //4#2:47
@@ -37,9 +37,9 @@ fun box(): String {
 //*S Kotlin
 //*F
 //+ 1 lambda.2.kt
-//builders/BuildersPackage$lambda_2$HASH$call$1
+//builders/Lambda_2Kt$call$1
 //+ 2 lambda.1.kt
-//_DefaultPackage$lambda_1$HASH
+//Lambda_1Kt
 //*L
 //1#1,18:1
 //8#2:19

compiler/testData/codegen/boxInline/smap/anonymous/lambda.2.kt

@@ -12,7 +12,7 @@ inline fun call(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) init: () -> Unit)
 //*S Kotlin
 //*F
 //+ 1 lambda.2.kt
-//builders/BuildersPackage$lambda_2$HASH$call$1
+//builders/Lambda_2Kt$call$1
 //*L
 //1#1,18:1
 //*E

compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.1.kt

@@ -25,9 +25,9 @@ fun box(): String {
 //*S Kotlin
 //*F
 //+ 1 lambdaOnCallSite.1.kt
-//_DefaultPackage
+//LambdaOnCallSite_1Kt
 //+ 2 lambdaOnCallSite.2.kt
-//builders/BuildersPackage
+//builders/LambdaOnCallSite_2Kt
 //*L
 //1#1,34:1
 //4#2:35

compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.1.kt

@@ -25,9 +25,9 @@ fun box(): String {
 //*S Kotlin
 //*F
 //+ 1 lambdaOnInlineCallSite.1.kt
-//_DefaultPackage
+//LambdaOnInlineCallSite_1Kt
 //+ 2 lambdaOnInlineCallSite.2.kt
-//builders/BuildersPackage
+//builders/LambdaOnInlineCallSite_2Kt
 //*L
 //1#1,56:1
 //4#2:57
@@ -39,7 +39,7 @@ fun box(): String {
 //*S Kotlin
 //*F
 //+ 1 lambdaOnInlineCallSite.1.kt
-//_DefaultPackage$lambdaOnInlineCallSite_1$HASH$test$1$1
+//LambdaOnInlineCallSite_1Kt$test$1$1
 //*L
 //1#1,56:1
 //*E
@@ -50,7 +50,7 @@ fun box(): String {
 //*S Kotlin
 //*F
 //+ 1 lambdaOnInlineCallSite.1.kt
-//_DefaultPackage$lambdaOnInlineCallSite_1$HASH$test$1$1
+//LambdaOnInlineCallSite_1Kt$test$1$1
 //*L
 //1#1,56:1
 //*E

compiler/testData/codegen/boxInline/smap/anonymous/object.1.kt

@@ -22,9 +22,9 @@ fun box(): String {
 //*S Kotlin
 //*F
 //+ 1 object.1.kt
-//_DefaultPackage
+//Object_1Kt
 //+ 2 object.2.kt
-//builders/BuildersPackage
+//builders/Object_2Kt
 //*L
 //1#1,45:1
 //4#2,5:46
@@ -36,9 +36,9 @@ fun box(): String {
 //*S Kotlin
 //*F
 //+ 1 object.2.kt
-//builders/BuildersPackage$object_2$HASH$call$1
+//builders/Object_2Kt$call$1
 //+ 2 object.1.kt
-//_DefaultPackage$object_1$HASH
+//Object_1Kt
 //*L
 //1#1,21:1
 //8#2:22

compiler/testData/codegen/boxInline/smap/anonymous/object.2.kt

@@ -15,7 +15,7 @@ inline fun call(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) init: () -> Unit)
 //*S Kotlin
 //*F
 //+ 1 object.2.kt
-//builders/BuildersPackage$object_2$HASH$call$1
+//builders/Object_2Kt$call$1
 //*L
 //1#1,21:1
 //*E

compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.1.kt

@@ -27,9 +27,9 @@ fun box(): String {
 //*S Kotlin
 //*F
 //+ 1 objectOnCallSite.1.kt
-//_DefaultPackage
+//ObjectOnCallSite_1Kt
 //+ 2 objectOnCallSite.2.kt
-//builders/BuildersPackage
+//builders/ObjectOnCallSite_2Kt
 //*L
 //1#1,36:1
 //4#2:37

compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.1.kt

@@ -27,9 +27,9 @@ fun box(): String {
 //*S Kotlin
 //*F
 //+ 1 objectOnInlineCallSite.1.kt
-//_DefaultPackage
+//ObjectOnInlineCallSite_1Kt
 //+ 2 objectOnInlineCallSite.2.kt
-//builders/BuildersPackage
+//builders/ObjectOnInlineCallSite_2Kt
 //*L
 //1#1,58:1
 //4#2:59
@@ -41,7 +41,7 @@ fun box(): String {
 //*S Kotlin
 //*F
 //+ 1 objectOnInlineCallSite.1.kt
-//_DefaultPackage$objectOnInlineCallSite_1$HASH$test$1$1
+//ObjectOnInlineCallSite_1Kt$test$1$1
 //*L
 //1#1,58:1
 //*E
@@ -52,7 +52,7 @@ fun box(): String {
 //*S Kotlin
 //*F
 //+ 1 objectOnInlineCallSite.1.kt
-//_DefaultPackage$objectOnInlineCallSite_1$HASH$test$1$1
+//ObjectOnInlineCallSite_1Kt$test$1$1
 //*L
 //1#1,58:1
 //*E

compiler/testData/codegen/boxInline/smap/assertion.1.kt

@@ -15,9 +15,9 @@ fun box(): String {
 //*S Kotlin
 //*F
 //+ 1 assertion.1.kt
-//_DefaultPackage
+//Assertion_1Kt
 //+ 2 assertion.2.kt
-//test/TestPackage
+//test/Assertion_2Kt
 //*L
 //1#1,25:1
 //15#2,7:26

compiler/testData/codegen/boxInline/smap/assertion.2.kt

@@ -20,7 +20,7 @@ public inline fun massert(value: Boolean, message: Any = "Assertion failed") {
     }
 }
 
-//TODO SHOUDL BE ABSENT
+//TODO SHOULD BE ABSENT
 
 //SMAP
 //assertion.2.kt
@@ -28,7 +28,7 @@ public inline fun massert(value: Boolean, message: Any = "Assertion failed") {
 //*S Kotlin
 //*F
 //+ 1 assertion.2.kt
-//test/TestPackage
+//test/Assertion_2Kt
 //*L
 //1#1,34:1
 //*E

compiler/testData/codegen/boxInline/smap/oneFile.1.kt

@@ -16,7 +16,7 @@ inline fun test(p: () -> String): String {
 //*S Kotlin
 //*F
 //+ 1 oneFile.1.kt
-//_DefaultPackage
+//OneFile_1Kt
 //*L
 //1#1,22:1
 //*E

compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.1.kt

@@ -12,9 +12,9 @@ fun box(): String {
 //*S Kotlin
 //*F
 //+ 1 inlineComponent.1.kt
-//_DefaultPackage
+//InlineComponent_1Kt
 //+ 2 inlineComponent.2.kt
-//zzz/ZzzPackage
+//zzz/InlineComponent_2Kt
 //*L
 //1#1,21:1
 //5#2,3:22

compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.1.kt

@@ -15,9 +15,9 @@ fun box(): String {
 //*S Kotlin
 //*F
 //+ 1 inlineIterator.1.kt
-//_DefaultPackage
+//InlineIterator_1Kt
 //+ 2 inlineIterator.2.kt
-//zzz/ZzzPackage
+//zzz/InlineIterator_2Kt
 //*L
 //1#1,24:1
 //5#2:25

compiler/testData/codegen/boxInline/smap/smap.1.kt

@@ -26,9 +26,9 @@ fun box(): String {
 //*S Kotlin
 //*F
 //+ 1 smap.1.kt
-//_DefaultPackage
+//Smap_1Kt
 //+ 2 smap.2.kt
-//builders/BuildersPackage
+//builders/Smap_2Kt
 //*L
 //1#1,38:1
 //16#2:39

compiler/testData/codegen/boxInline/smap/smap.2.kt

@@ -22,7 +22,7 @@ inline fun html(init: () -> Unit) {
 //*S Kotlin
 //*F
 //+ 1 smap.2.kt
-//builders/BuildersPackage
+//builders/Smap_2Kt
 //*L
 //1#1,28:1
 //*E

compiler/testData/codegen/boxWithStdlib/fullJdk/platformTypeAssertionStackTrace.kt

@@ -12,8 +12,8 @@ fun box(): String {
             return "Fail: very small stack trace, should at least have current function and JUnit reflective calls: ${Arrays.toString(st)}"
         }
         val top = st[0]
-        if (!(top.getClassName().startsWith("_DefaultPackage") && top.getMethodName() == "box")) {
+        if (!(top.getClassName() == "PlatformTypeAssertionStackTraceKt" && top.getMethodName() == "box")) {
-            return "Fail: top stack trace element should be box() from default package, but was $top"
+            return "Fail: top stack trace element should be PlatformTypeAssertionStackTraceKt.box() from default package, but was $top"
         }
         return "OK"
     }

compiler/testData/codegen/boxWithStdlib/reflection/enclosing/classInLambda.kt

@@ -9,7 +9,7 @@ fun box(): String {
     if (enclosingMethod?.getName() != "invoke") return "method: $enclosingMethod"
 
     val enclosingClass = classInLambda.javaClass.getEnclosingClass()!!.getName()
-    if (!enclosingClass.startsWith("_DefaultPackage\$") || !enclosingClass.endsWith("\$box\$classInLambda\$1")) return "enclosing class: $enclosingClass"
+    if (enclosingClass != "ClassInLambdaKt\$box\$classInLambda\$1") return "enclosing class: $enclosingClass"
 
     val declaringClass = classInLambda.javaClass.getDeclaringClass()
     if (declaringClass != null) return "class has a declaring class"

compiler/testData/codegen/boxWithStdlib/reflection/enclosing/functionExpressionInProperty.kt

@@ -7,7 +7,7 @@ fun box(): String {
     if (enclosingMethod != null) return "method: $enclosingMethod"
 
     val enclosingClass = javaClass.getEnclosingClass()!!.getName()
-    if (!enclosingClass.startsWith("_DefaultPackage") || !enclosingClass.contains("functionExpressionInProperty")) return "enclosing class: $enclosingClass"
+    if (enclosingClass != "FunctionExpressionInPropertyKt") return "enclosing class: $enclosingClass"
 
     val declaringClass = javaClass.getDeclaringClass()
     if (declaringClass != null) return "anonymous function has a declaring class: $declaringClass"

compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInFunction.kt

@@ -6,7 +6,7 @@ fun box(): String {
     if (enclosingMethod?.getName() != "box") return "method: $enclosingMethod"
 
     val enclosingClass = javaClass.getEnclosingClass()!!.getName()
-    if (!enclosingClass.startsWith("_DefaultPackage") || !enclosingClass.contains("lambdaInFunction")) return "enclosing class: $enclosingClass"
+    if (enclosingClass != "LambdaInFunctionKt") return "enclosing class: $enclosingClass"
 
     val declaringClass = javaClass.getDeclaringClass()
     if (declaringClass != null) return "anonymous function has a declaring class: $declaringClass"

compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInLambda.kt

@@ -8,7 +8,7 @@ fun box(): String {
     if (enclosingMethod?.getName() != "invoke") return "method: $enclosingMethod"
 
     val enclosingClass = javaClass.getEnclosingClass()!!.getName()
-    if (!enclosingClass.startsWith("_DefaultPackage\$") || !enclosingClass.contains("\$box\$l\$1")) return "enclosing class: $enclosingClass"
+    if (enclosingClass != "LambdaInLambdaKt\$box\$l\$1") return "enclosing class: $enclosingClass"
 
     val declaringClass = javaClass.getDeclaringClass()
     if (declaringClass != null) return "anonymous function has a declaring class: $declaringClass"

compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInLocalClassConstructor.kt

@@ -12,10 +12,10 @@ fun box(): String {
 
     val javaClass = l.a.javaClass
     val enclosingMethod = javaClass.getEnclosingConstructor()!!.getName()
-    if (!enclosingMethod.startsWith("_DefaultPackage\$") || !enclosingMethod.endsWith("\$box\$L")) return "ctor: $enclosingMethod"
+    if (enclosingMethod != "LambdaInLocalClassConstructorKt\$box\$L") return "ctor: $enclosingMethod"
 
     val enclosingClass = javaClass.getEnclosingClass()!!.getName()
-    if (!enclosingClass.startsWith("_DefaultPackage\$") || !enclosingClass.endsWith("\$box\$L")) return "enclosing class: $enclosingClass"
+    if (enclosingClass != "LambdaInLocalClassConstructorKt\$box\$L") return "enclosing class: $enclosingClass"
 
     if (enclosingMethod != enclosingClass) return "$enclosingClass != $enclosingMethod"
 

compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInLocalClassSuperCall.kt

@@ -7,10 +7,10 @@ fun box(): String {
 
     val javaClass = l.a.javaClass
     val enclosingMethod = javaClass.getEnclosingConstructor()!!.getName()
-    if (!enclosingMethod.startsWith("_DefaultPackage\$") || !enclosingMethod.endsWith("\$box\$L")) return "ctor: $enclosingMethod"
+    if (enclosingMethod != "LambdaInLocalClassSuperCallKt\$box\$L") return "ctor: $enclosingMethod"
 
     val enclosingClass = javaClass.getEnclosingClass()!!.getName()
-    if (!enclosingClass.startsWith("_DefaultPackage\$") || !enclosingClass.endsWith("\$box\$L")) return "enclosing class: $enclosingClass"
+    if (enclosingClass != "LambdaInLocalClassSuperCallKt\$box\$L") return "enclosing class: $enclosingClass"
 
     if (enclosingMethod != enclosingClass) return "$enclosingClass != $enclosingMethod"
 

compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInLocalFunction.kt

@@ -8,7 +8,7 @@ fun box(): String {
     if (enclosingMethod?.getName() != "invoke") return "method: $enclosingMethod"
 
     val enclosingClass = javaClass.getEnclosingClass()!!.getName()
-    if (!enclosingClass.startsWith("_DefaultPackage\$") || !enclosingClass.contains("\$box$1")) return "enclosing class: $enclosingClass"
+    if (enclosingClass != "LambdaInLocalFunctionKt\$box$1") return "enclosing class: $enclosingClass"
 
     val declaringClass = javaClass.getDeclaringClass()
     if (declaringClass != null) return "anonymous function has a declaring class: $declaringClass"

compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInMemberFunctionInLocalClass.kt

@@ -10,7 +10,7 @@ fun box(): String {
     if (enclosingMethod?.getName() != "foo") return "method: $enclosingMethod"
 
     val enclosingClass = javaClass.getEnclosingClass()!!.getName()
-    if (!enclosingClass.startsWith("_DefaultPackage\$") || !enclosingClass.contains("\$box\$C")) return "enclosing class: $enclosingClass"
+    if (enclosingClass != "LambdaInMemberFunctionInLocalClassKt\$box\$C") return "enclosing class: $enclosingClass"
 
     val declaringClass = javaClass.getDeclaringClass()
     if (declaringClass != null) return "anonymous function has a declaring class: $declaringClass"

compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInObjectExpression.kt

@@ -13,10 +13,10 @@ fun box(): String {
 
     val javaClass = l.a.javaClass
     val enclosingMethod = javaClass.getEnclosingConstructor()!!.getName()
-    if (!enclosingMethod.startsWith("_DefaultPackage\$") || !enclosingMethod.endsWith("\$box\$l\$1")) return "ctor: $enclosingMethod"
+    if (enclosingMethod != "LambdaInObjectExpressionKt\$box\$l\$1") return "ctor: $enclosingMethod"
 
     val enclosingClass = javaClass.getEnclosingClass()!!.getName()
-    if (!enclosingClass.startsWith("_DefaultPackage\$") || !enclosingClass.endsWith("\$box\$l\$1")) return "enclosing class: $enclosingClass"
+    if (enclosingClass != "LambdaInObjectExpressionKt\$box\$l\$1") return "enclosing class: $enclosingClass"
 
     if (enclosingMethod != enclosingClass) return "$enclosingClass != $enclosingMethod"
 

compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInObjectLiteralSuperCall.kt

@@ -11,7 +11,7 @@ fun box(): String {
     if (enclosingMethod != "box") return "method: $enclosingMethod"
 
     val enclosingClass = javaClass.getEnclosingClass()!!.getName()
-    if (!enclosingClass.startsWith("_DefaultPackage\$") || enclosingClass != l.javaClass.getEnclosingClass()!!.getName())
+    if (enclosingClass != "LambdaInObjectLiteralSuperCallKt" || enclosingClass != l.javaClass.getEnclosingClass()!!.getName())
         return "enclosing class: $enclosingClass"
 
     val declaringClass = javaClass.getDeclaringClass()

compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInPackage.kt

@@ -2,7 +2,7 @@ val l: Any = {}
 
 fun box(): String {
     val enclosingClass = l.javaClass.getEnclosingClass()!!.getName()
-    if (!enclosingClass.startsWith("_DefaultPackage") || !enclosingClass.contains("lambdaInPackage")) return "enclosing class: $enclosingClass"
+    if (enclosingClass != "LambdaInPackageKt") return "enclosing class: $enclosingClass"
 
     val enclosingConstructor = l.javaClass.getEnclosingConstructor()
     if (enclosingConstructor != null) return "enclosing constructor found: $enclosingConstructor"

compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInPropertyGetter.kt

@@ -7,7 +7,7 @@ fun box(): String {
     if (enclosingMethod?.getName() != "getL") return "method: $enclosingMethod"
 
     val enclosingClass = l.javaClass.getEnclosingClass()!!.getName()
-    if (!enclosingClass.startsWith("_DefaultPackage") || !enclosingClass.contains("lambdaInPropertyGetter")) return "enclosing class: $enclosingClass"
+    if (enclosingClass != "LambdaInPropertyGetterKt") return "enclosing class: $enclosingClass"
 
     val declaringClass = l.javaClass.getDeclaringClass()
     if (declaringClass != null) return "anonymous function has a declaring class: $declaringClass"

compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInPropertySetter.kt

@@ -13,7 +13,7 @@ fun box(): String {
     if (enclosingMethod?.getName() != "setL") return "method: $enclosingMethod"
 
     val enclosingClass = l.javaClass.getEnclosingClass()!!.getName()
-    if (!enclosingClass.startsWith("_DefaultPackage") || !enclosingClass.contains("lambdaInPropertySetter")) return "enclosing class: $enclosingClass"
+    if (enclosingClass != "LambdaInPropertySetterKt") return "enclosing class: $enclosingClass"
 
     val declaringClass = l.javaClass.getDeclaringClass()
     if (declaringClass != null) return "anonymous function has a declaring class: $declaringClass"

compiler/testData/codegen/boxWithStdlib/reflection/enclosing/namedFunctionExpressionInProperty.kt

@@ -7,7 +7,7 @@ fun box(): String {
     if (enclosingMethod != null) return "method: $enclosingMethod"
 
     val enclosingClass = javaClass.getEnclosingClass()!!.getName()
-    if (!enclosingClass.startsWith("_DefaultPackage") || !enclosingClass.contains("namedFunctionExpressionInProperty")) return "enclosing class: $enclosingClass"
+    if (enclosingClass != "NamedFunctionExpressionInPropertyKt") return "enclosing class: $enclosingClass"
 
     val declaringClass = javaClass.getDeclaringClass()
     if (declaringClass != null) return "anonymous function has a declaring class: $declaringClass"

compiler/testData/codegen/boxWithStdlib/reflection/enclosing/objectInLambda.kt

@@ -8,7 +8,7 @@ fun box(): String {
     if (enclosingMethod?.getName() != "invoke") return "method: $enclosingMethod"
 
     val enclosingClass = objectInLambda.javaClass.getEnclosingClass()!!.getName()
-    if (!enclosingClass.startsWith("_DefaultPackage\$") || !enclosingClass.endsWith("\$box\$objectInLambda\$1")) return "enclosing class: $enclosingClass"
+    if (enclosingClass != "ObjectInLambdaKt\$box\$objectInLambda\$1") return "enclosing class: $enclosingClass"
 
     val declaringClass = objectInLambda.javaClass.getDeclaringClass()
     if (declaringClass != null) return "anonymous object has a declaring class"

compiler/testData/codegen/bytecodeText/constClosureOptimization.kt

@@ -17,6 +17,6 @@ fun test() {
     (::local)()
 }
 
-// 3 GETSTATIC _DefaultPackage\$.+\$test\$1\.INSTANCE\$
+// 3 GETSTATIC ConstClosureOptimizationKt\$test\$1\.INSTANCE\$
-// 1 GETSTATIC _DefaultPackage\$.+\$test\$2\.INSTANCE\$
+// 1 GETSTATIC ConstClosureOptimizationKt\$test\$2\.INSTANCE\$
-// 1 GETSTATIC _DefaultPackage\$.+\$test\$3\.INSTANCE\$
+// 1 GETSTATIC ConstClosureOptimizationKt\$test\$3\.INSTANCE\$

compiler/testData/codegen/bytecodeText/defaultDelegation.kt

@@ -5,4 +5,4 @@ fun simpleFoo(s: Int = 111) {
 }
 
 // 1 BIPUSH 111
-// 1 INVOKESTATIC foo/FooPackage.+\.simpleFoo\$default \(II\)V
+// 1 INVOKESTATIC foo/DefaultDelegationKt.simpleFoo\$default \(II\)V

compiler/testData/codegen/bytecodeText/inlineFromOtherModule.kt

@@ -4,4 +4,4 @@ fun foo() {
 
 // assert function will be inlined, and we assure that there are no calls via package part, but is call via package facade in inlined code
 // 0 INVOKESTATIC kotlin\/KotlinPackage.+\.getASSERTIONS_ENABLED \(\)Z
-// 1 INVOKESTATIC kotlin\/KotlinPackage\.getASSERTIONS_ENABLED \(\)Z
+// 1 INVOKESTATIC kotlin\/AssertionsJVMKt\.getASSERTIONS_ENABLED \(\)Z

compiler/testData/codegen/bytecodeText/topLevelFunWithDefaultArgs.kt

@@ -1,4 +1,4 @@
 fun foo(a: Int = 1) {}
 
 // 0 _DefaultPackage.foo
-// 3 INVOKESTATIC _DefaultPackage.+
+// 3 INVOKESTATIC TopLevelFunWithDefaultArgsKt\.foo

compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/a1.kt

@@ -0,0 +1,8 @@
+fun Int.test1() {}
+
+fun test2() {
+    1.test1()
+}
+
+// 2 INVOKESTATIC A1Kt.test1 \(I\)V
+// 1 INVOKESTATIC A1Kt.test2 \(\)V

compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/a1.kt

@@ -0,0 +1,6 @@
+package a
+
+fun test1() {}
+
+// 2 INVOKESTATIC a/A1Kt.test1 \(\)V
+// 1 INVOKESTATIC b/A2Kt.test2 \(\)V

compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/a1.kt

@@ -0,0 +1,8 @@
+fun test1() {}
+
+fun test2() {
+    test1()
+}
+
+// 2 INVOKESTATIC A1Kt.test1 \(\)V
+// 1 INVOKESTATIC A1Kt.test2 \(\)V

compiler/testData/codegen/topLevelMemberInvocation/property/a1.kt

@@ -0,0 +1,6 @@
+package a
+
+val prop = 1
+
+// 2 INVOKESTATIC a/A1Kt.getProp \(\)I
+// 1 GETSTATIC a/A1Kt.prop \: I

compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/a1.kt

@@ -0,0 +1,9 @@
+package a
+
+val prop: Int = 0
+    get() {
+        return $prop + 1
+    }
+
+// 2 INVOKESTATIC a/A1Kt.getProp \(\)I
+// 1 GETSTATIC a/A1Kt.prop \: I

compiler/testData/serialization/local/anonymousObject.txt

@@ -1,4 +1,4 @@
-local final class `_DefaultPackage$anonymousObject$*$main$1` : java.lang.Runnable
+local final class `AnonymousObjectKt$main$1` : java.lang.Runnable
 
-public constructor `_DefaultPackage$anonymousObject$*$main$1`()
+public constructor `AnonymousObjectKt$main$1`()
 public open override /*1*/ fun run(): kotlin.Unit

compiler/testData/serialization/local/deepInnerChain.txt

@@ -1,7 +1,7 @@
 local final inner class Deepest
 
 public constructor Deepest()
-internal final fun deep(): `_DefaultPackage$deepInnerChain$*$main$Local$Inner$prop$1$foo$1$DeepLocal`
+internal final fun deep(): `DeepInnerChainKt$main$Local$Inner$prop$1$foo$1$DeepLocal`
-internal final fun deepest(): `_DefaultPackage$deepInnerChain$*$main$Local$Inner$prop$1$foo$1$DeepLocal`.Deepest?
+internal final fun deepest(): `DeepInnerChainKt$main$Local$Inner$prop$1$foo$1$DeepLocal`.Deepest?
-internal final fun inner(): `_DefaultPackage$deepInnerChain$*$main$Local`.Inner
+internal final fun inner(): `DeepInnerChainKt$main$Local`.Inner
-internal final fun local(): `_DefaultPackage$deepInnerChain$*$main$Local`
+internal final fun local(): `DeepInnerChainKt$main$Local`

compiler/testData/serialization/local/innerOfLocal.txt

@@ -1,5 +1,5 @@
 local final inner class Inner
 
 public constructor Inner()
-internal final fun inner(/*0*/ i: `_DefaultPackage$innerOfLocal$*$main$Local`.Inner): kotlin.Unit
+internal final fun inner(/*0*/ i: `InnerOfLocalKt$main$Local`.Inner): kotlin.Unit
-internal final fun local(/*0*/ l: `_DefaultPackage$innerOfLocal$*$main$Local`): kotlin.Unit
+internal final fun local(/*0*/ l: `InnerOfLocalKt$main$Local`): kotlin.Unit

compiler/testData/serialization/local/localClassInSignature.txt

@@ -1,7 +1,7 @@
-local open class `_DefaultPackage$localClassInSignature$*$main$Local`
+local open class `LocalClassInSignatureKt$main$Local`
 
-public constructor `_DefaultPackage$localClassInSignature$*$main$Local`()
+public constructor `LocalClassInSignatureKt$main$Local`()
-internal final val returnType: `_DefaultPackage$localClassInSignature$*$main$Local`
+internal final val returnType: `LocalClassInSignatureKt$main$Local`
-internal final fun </*0*/ T : `_DefaultPackage$localClassInSignature$*$main$Local`, /*1*/ U : T> generic(/*0*/ t: T): U
+internal final fun </*0*/ T : `LocalClassInSignatureKt$main$Local`, /*1*/ U : T> generic(/*0*/ t: T): U
-internal final fun param(/*0*/ l: `_DefaultPackage$localClassInSignature$*$main$Local`): kotlin.Unit
+internal final fun param(/*0*/ l: `LocalClassInSignatureKt$main$Local`): kotlin.Unit
-internal final fun `_DefaultPackage$localClassInSignature$*$main$Local`.receiver(): `_DefaultPackage$localClassInSignature$*$main$Local`
+internal final fun `LocalClassInSignatureKt$main$Local`.receiver(): `LocalClassInSignatureKt$main$Local`

compiler/testData/serialization/local/simpleInTopLevelFunction.txt

@@ -1,3 +1,3 @@
-local final class `_DefaultPackage$simpleInTopLevelFunction$*$main$Local`
+local final class `SimpleInTopLevelFunctionKt$main$Local`
 
-public constructor `_DefaultPackage$simpleInTopLevelFunction$*$main$Local`()
+public constructor `SimpleInTopLevelFunctionKt$main$Local`()

compiler/testData/writeSignature/declarationSiteVariance/OutInField.kt

@@ -1,10 +1,10 @@
 public val list: List<String> = throw Exception()
 public val mutList: MutableList<String> = throw Exception()
 
-// field: _DefaultPackage::list
+// field: OutInFieldKt::list
 // jvm signature: Ljava/util/List;
 // generic signature: Ljava/util/List<+Ljava/lang/String;>;
 
-// field: _DefaultPackage::mutList
+// field: OutInFieldKt::mutList
 // jvm signature: Ljava/util/List;
 // generic signature: Ljava/util/List<Ljava/lang/String;>;

compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java

@@ -145,6 +145,12 @@ public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTes
             doJvmTest(fileName);
         }
 
+        @TestMetadata("sanitized-name.clash.args")
+        public void testSanitized_name_clash() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/sanitized-name.clash.args");
+            doJvmTest(fileName);
+        }
+
         @TestMetadata("signatureClash.args")
         public void testSignatureClash() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/signatureClash.args");

compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java

@@ -76,18 +76,18 @@ public class OuterClassGenTest extends CodegenTestCase {
     }
 
     public void testObjectLiteralInPackageClass() throws Exception {
-        OuterClassInfo expectedInfo = new OuterClassInfo("foo/FooPackage$outerClassInfo$", null, null);
+        OuterClassInfo expectedInfo = new OuterClassInfo("foo/OuterClassInfo", null, null);
-        doCustomTest("foo/FooPackage\\$.+\\$packageObjectLiteral\\$1", expectedInfo, "outerClassInfo");
+        doCustomTest("foo/OuterClassInfoKt\\$packageObjectLiteral\\$1", expectedInfo, "outerClassInfo");
     }
 
     public void testLocalClassInTopLevelFunction() throws Exception {
-        OuterClassInfo expectedInfo = new OuterClassInfo("foo/FooPackage$outerClassInfo$", "packageMethod", "(Lfoo/Foo;)V");
+        OuterClassInfo expectedInfo = new OuterClassInfo("foo/OuterClassInfo", "packageMethod", "(Lfoo/Foo;)V");
-        doCustomTest("foo/FooPackage\\$.+\\$packageMethod\\$PackageLocalClass", expectedInfo, "outerClassInfo");
+        doCustomTest("foo/OuterClassInfoKt\\$packageMethod\\$PackageLocalClass", expectedInfo, "outerClassInfo");
     }
 
     public void testLocalObjectInTopLevelFunction() throws Exception {
-        OuterClassInfo expectedInfo = new OuterClassInfo("foo/FooPackage$outerClassInfo$", "packageMethod", "(Lfoo/Foo;)V");
+        OuterClassInfo expectedInfo = new OuterClassInfo("foo/OuterClassInfo", "packageMethod", "(Lfoo/Foo;)V");
-        doCustomTest("foo/FooPackage\\$.+\\$packageMethod\\$PackageLocalObject", expectedInfo, "outerClassInfo");
+        doCustomTest("foo/OuterClassInfoKt\\$packageMethod\\$PackageLocalObject", expectedInfo, "outerClassInfo");
     }
 
     public void testLocalObjectInInlineFunction() throws Exception {

idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java

@@ -4557,7 +4557,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class OptimizeImports extends AbstractQuickFixTest {
         public void testAllFilesPresentInOptimizeImports() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/optimizeImports"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/optimizeImports"), Pattern.compile("^([a-zA-Z0-9]+)\\.kt$"), true);
         }
 
         @TestMetadata("fileRuntime.kt")