Move name sanitization utilities to module 'descriptors'

2017-01-11 14:22:18 +03:00
parent f4d59304e2
commit 6ffa56b640
7 changed files with 63 additions and 38 deletions
@@ -134,7 +134,7 @@ open class MetadataSerializer(private val dependOnOldBuiltIns: Boolean) {

    private fun getPackageFilePath(packageFqName: FqName, fileName: String): String =
            packageFqName.asString().replace('.', '/') + "/" +
-            PackagePartClassUtils.getPartClassName(fileName.substringBeforeLast(".kt")) + DOT_METADATA_FILE_EXTENSION
+            PackagePartClassUtils.getFilePartShortName(fileName) + DOT_METADATA_FILE_EXTENSION

    private fun getClassFilePath(classId: ClassId): String =
            classId.asSingleFqName().asString().replace('.', '/') + DOT_METADATA_FILE_EXTENSION