From 99bfbd0a26c0666aaed1a745b17b1b9187192109 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 22 Nov 2016 10:14:43 +0100 Subject: [PATCH] Never set isScript flag for stubs of file facade and multifile facade classes (scripts are always generated with ClassKind.CLASS) --- .../kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt | 4 ++-- .../kotlin/idea/stubindex/KotlinFileStubForIde.kt | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt index 4516e8a143d..9cd67cd3e83 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt @@ -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 diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileStubForIde.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileStubForIde.kt index fa26e31364d..4fd2806b0ee 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileStubForIde.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileStubForIde.kt @@ -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?, isScript: Boolean): KotlinFileStubImpl = + fun forMultifileClassStub(facadeFqName: FqName, partNames: List?): 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())!!