azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test fix

Browse Source
This commit is contained in:
Michael Bogdanov
2015-08-27 10:37:15 +03:00
parent 42d14f6837
commit 843241848f
14 changed files with 62 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.kt
+4 -3
View File
@@ -56,9 +56,9 @@ import java.util.*
@TestOnly
public @jvmStatic fun getDefaultPartFqName(facadeClassFqName: FqName, file: VirtualFile): FqName =
getDefaultPartFqNameForFilePath(facadeClassFqName.parent(), file.name)
getPackagePartFqName(facadeClassFqName.parent(), file.name)
private @jvmStatic fun getDefaultPartFqNameForFilePath(packageFqName: FqName, fileName: String): FqName {
public @jvmStatic fun getPackagePartFqName(packageFqName: FqName, fileName: String): FqName {
val partClassName = getPartClassName(FileUtil.getNameWithoutExtension(fileName))
return packageFqName.child(Name.identifier(partClassName))
}
@@ -73,7 +73,8 @@ import java.util.*
JvmClassName.byFqNameWithoutInnerClasses(getPackagePartFqName(file)).internalName
public @jvmStatic fun getPackagePartFqName(file: JetFile): FqName =
getDefaultPartFqNameForFilePath(file.packageFqName, file.name)
getPackagePartFqName(file.packageFqName, file.name)
public @jvmStatic fun getPackagePartFqName(callable: DeserializedCallableMemberDescriptor): FqName {
val implClassName = callable.nameResolver.getName(callable.proto.getExtension(JvmProtoBuf.implClassName))