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

(lightClass) multifile classes facade in libraries added

Browse Source 
relates to #KT-39196
This commit is contained in:
Vladimir Ilmov
2020-08-17 11:25:50 +02:00
parent ac22232b8d
commit a5d91339b5
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt
+9 -5
View File
@@ -108,12 +108,18 @@ object JvmFileClassUtil {
internal class ParsedJvmFileClassAnnotations(val jvmName: String?, val jvmPackageName: FqName?, val isMultifileClass: Boolean) internal class ParsedJvmFileClassAnnotations(val jvmName: String?, val jvmPackageName: FqName?, val isMultifileClass: Boolean)
val KtFile.javaFileFacadeFqName: FqName val KtFile.fileClassInfo: JvmFileClassInfo
get() { get() {
return CachedValuesManager.getCachedValue(this) { return CachedValuesManager.getCachedValue(this) {
CachedValueProvider.Result(JvmFileClassUtil.getFileClassInfoNoResolve(this), this)
}
}
val KtFile.javaFileFacadeFqName: FqName
get() {
val facadeFqName = val facadeFqName =
if (isCompiled) packageFqName.child(Name.identifier(virtualFile.nameWithoutExtension)) if (isCompiled) packageFqName.child(Name.identifier(virtualFile.nameWithoutExtension))
else JvmFileClassUtil.getFileClassInfoNoResolve(this).facadeClassFqName else this.fileClassInfo.facadeClassFqName
if (!Name.isValidIdentifier(facadeFqName.shortName().identifier)) { if (!Name.isValidIdentifier(facadeFqName.shortName().identifier)) {
LOG.error( LOG.error(
@@ -121,9 +127,7 @@ val KtFile.javaFileFacadeFqName: FqName
"(isCompiled = $isCompiled)" "(isCompiled = $isCompiled)"
) )
} }
return facadeFqName
CachedValueProvider.Result(facadeFqName, this)
}
} }
private val LOG = Logger.getInstance("JvmFileClassUtil") private val LOG = Logger.getInstance("JvmFileClassUtil")