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

Never set isScript flag for stubs of file facade and multifile facade classes (scripts are always generated with ClassKind.CLASS)

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-11-22 10:14:43 +01:00
parent 075a0bc7f1
commit 99bfbd0a26
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
+2 -2
View File
@@ -71,7 +71,7 @@ fun createFileFacadeStub(
c: ClsStubBuilderContext
): KotlinFileStubImpl {
val packageFqName = facadeFqName.parent()
val fileStub = KotlinFileStubForIde.forFileFacadeStub(facadeFqName, packageFqName.isRoot)
val fileStub = KotlinFileStubForIde.forFileFacadeStub(facadeFqName)
setupFileStub(fileStub, packageFqName)
val container = ProtoContainer.Package(
packageFqName, c.nameResolver, c.typeTable, JvmPackagePartSource(JvmClassName.byClassId(ClassId.topLevel(facadeFqName)), null)
@@ -88,7 +88,7 @@ fun createMultifileClassStub(
): KotlinFileStubImpl {
val packageFqName = facadeFqName.parent()
val partNames = header.data?.asList()?.map { it.substringAfterLast('/') }
val fileStub = KotlinFileStubForIde.forMultifileClassStub(facadeFqName, partNames, packageFqName.isRoot)
val fileStub = KotlinFileStubForIde.forMultifileClassStub(facadeFqName, partNames)
setupFileStub(fileStub, packageFqName)
for (partFile in partFiles) {
val partHeader = partFile.classHeader
idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileStubForIde.kt
+4 -4
View File
@@ -53,21 +53,21 @@ class KotlinFileStubForIde(
facadePartSimpleNames = null,
isScript = isScript)
fun forFileFacadeStub(facadeFqName: FqName, isScript: Boolean): KotlinFileStubImpl =
fun forFileFacadeStub(facadeFqName: FqName): KotlinFileStubImpl =
KotlinFileStubForIde(jetFile = null,
packageName = facadeFqName.parent().stringRef(),
facadeSimpleName = facadeFqName.shortName().stringRef(),
partSimpleName = facadeFqName.shortName().stringRef(),
facadePartSimpleNames = null,
isScript = isScript)
isScript = false)
fun forMultifileClassStub(facadeFqName: FqName, partNames: List<String>?, isScript: Boolean): KotlinFileStubImpl =
fun forMultifileClassStub(facadeFqName: FqName, partNames: List<String>?): KotlinFileStubImpl =
KotlinFileStubForIde(jetFile = null,
packageName = facadeFqName.parent().stringRef(),
facadeSimpleName = facadeFqName.shortName().stringRef(),
partSimpleName = null,
facadePartSimpleNames = partNames?.map { StringRef.fromString(it) },
isScript = isScript)
isScript = false)
private fun FqName.stringRef() = StringRef.fromString(asString())!!
private fun Name.stringRef() = StringRef.fromString(asString())!!