From 123c55b6db7e3e798ccdcabc0c19cf3b41e87084 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 14 Oct 2015 20:06:21 +0300 Subject: [PATCH] IDELightClassGenerationSupport: fix not generating @JvmName annotation for file facade light classes This was a minor inconsistency between compiler and ide light classes --- .../caches/resolve/IDELightClassGenerationSupport.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt index f4bb70b3730..2f5e98d6ca8 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt @@ -43,7 +43,10 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.kotlin.resolve.lazy.* +import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode +import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil +import org.jetbrains.kotlin.resolve.lazy.NoDescriptorForDeclarationException +import org.jetbrains.kotlin.resolve.lazy.ResolveSession import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.utils.sure import java.util.* @@ -238,7 +241,7 @@ public class IDELightClassGenerationSupport(private val project: Project) : Ligh } - private fun forceResolvePackageDeclarations(files: Collection, session: KotlinCodeAnalyzer) { + private fun forceResolvePackageDeclarations(files: Collection, session: ResolveSession) { for (file in files) { // SCRIPT: not supported if (file.isScript) continue @@ -275,6 +278,8 @@ public class IDELightClassGenerationSupport(private val project: Project) : Ligh LOG.error("Unsupported declaration kind: " + declaration + " in file " + file.name + "\n" + file.text) } } + + ForceResolveUtil.forceResolveAllContents(session.getFileAnnotations(file)) } }