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

IDELightClassGenerationSupport: fix not generating @JvmName annotation for file facade light classes

Browse Source 
This was a minor inconsistency between compiler and ide light classes
This commit is contained in:
Pavel V. Talanov
2015-10-14 20:06:21 +03:00
parent 9e9f593a7f
commit 123c55b6db
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
+7 -2
View File
@@ -43,7 +43,10 @@ import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext
import org.jetbrains.kotlin.resolve.BindingContext 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.resolve.scopes.JetScope
import org.jetbrains.kotlin.utils.sure import org.jetbrains.kotlin.utils.sure
import java.util.* import java.util.*
@@ -238,7 +241,7 @@ public class IDELightClassGenerationSupport(private val project: Project) : Ligh
} }
private fun forceResolvePackageDeclarations(files: Collection<JetFile>, session: KotlinCodeAnalyzer) { private fun forceResolvePackageDeclarations(files: Collection<JetFile>, session: ResolveSession) {
for (file in files) { for (file in files) {
// SCRIPT: not supported // SCRIPT: not supported
if (file.isScript) continue 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) LOG.error("Unsupported declaration kind: " + declaration + " in file " + file.name + "\n" + file.text)
} }
} }
ForceResolveUtil.forceResolveAllContents(session.getFileAnnotations(file))
} }
} }