[Symbol LC] rename analyseForLightClasses -> analyzeForLightClasses

This commit is contained in:
Ilya Kirillov
2022-06-28 16:18:16 +02:00
parent 00b893444c
commit aca8643262
6 changed files with 13 additions and 19 deletions
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.light.classes.symbol
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiClass
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.decompiled.light.classes.DecompiledLightClassesFactory
import org.jetbrains.kotlin.analysis.project.structure.KtLibraryModule
import org.jetbrains.kotlin.analysis.project.structure.KtSourceModule
@@ -20,7 +19,7 @@ import org.jetbrains.kotlin.asJava.classes.KtFakeLightClass
import org.jetbrains.kotlin.asJava.classes.KtLightClass
import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName
import org.jetbrains.kotlin.light.classes.symbol.caches.SymbolLightClassFacadeCache
import org.jetbrains.kotlin.light.classes.symbol.classes.analyseForLightClasses
import org.jetbrains.kotlin.light.classes.symbol.classes.analyzeForLightClasses
import org.jetbrains.kotlin.light.classes.symbol.classes.getOrCreateFirLightClass
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName
@@ -137,7 +136,7 @@ class KotlinAsJavaFirSupport(private val project: Project) : KotlinAsJavaSupport
val lightClassFacadeCache = project.getService(SymbolLightClassFacadeCache::class.java)
return filesByModule.mapNotNull { (module, files) ->
analyseForLightClasses(module) {
analyzeForLightClasses(module) {
lightClassFacadeCache.getOrCreateSymbolLightFacade(files, facadeFqName)
}
}
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.light.classes.symbol.caches
import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.decompiled.light.classes.DecompiledLightClassesFactory
import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtClsFile
import org.jetbrains.kotlin.analysis.providers.createProjectWideOutOfBlockModificationTracker
@@ -15,7 +14,7 @@ import org.jetbrains.kotlin.analysis.utils.collections.ConcurrentMapBasedCache
import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName
import org.jetbrains.kotlin.light.classes.symbol.FirLightClassForFacade
import org.jetbrains.kotlin.light.classes.symbol.classes.analyseForLightClasses
import org.jetbrains.kotlin.light.classes.symbol.classes.analyzeForLightClasses
import org.jetbrains.kotlin.light.classes.symbol.decompiled.KtLightClassForDecompiledFacade
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.KtClassOrObject
@@ -49,7 +48,7 @@ class SymbolLightClassFacadeCache(private val project: Project) {
val firstFile = ktFiles.first()
return when {
ktFiles.none { it.isCompiled } ->
analyseForLightClasses(firstFile) {
analyzeForLightClasses(firstFile) {
FirLightClassForFacade(firstFile.manager, facadeClassFqName, ktFiles)
}
ktFiles.all { it.isCompiled } -> {
@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.asJava.elements.KtLightMethod
import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.light.classes.symbol.classes.analyseForLightClasses
import org.jetbrains.kotlin.light.classes.symbol.classes.createField
import org.jetbrains.kotlin.light.classes.symbol.classes.createMethods
import org.jetbrains.kotlin.load.java.structure.LightClassOriginKind
@@ -54,9 +53,7 @@ class FirLightClassForFacade(
private val fileSymbols by lazyPub {
files.map { ktFile ->
analyseForLightClasses(ktFile) {
ktFile.getFileSymbol()
}
ktFile.getFileSymbol()
}
}
@@ -14,8 +14,7 @@ import org.jetbrains.kotlin.psi.KtClassOrObject
import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
//TODO Make fake class symbol based
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.light.classes.symbol.classes.analyseForLightClasses
import org.jetbrains.kotlin.light.classes.symbol.classes.analyzeForLightClasses
class KtFirBasedFakeLightClass(kotlinOrigin: KtClassOrObject) :
KtFakeLightClass(kotlinOrigin) {
@@ -33,7 +32,7 @@ class KtFirBasedFakeLightClass(kotlinOrigin: KtClassOrObject) :
LightClassInheritanceHelper.getService(project).isInheritor(this, baseClass, checkDeep).ifSure { return it }
val baseClassOrigin = (baseClass as? KtLightClass)?.kotlinOrigin ?: return false
return analyseForLightClasses(baseClassOrigin) {
return analyzeForLightClasses(baseClassOrigin) {
kotlinOrigin.checkIsInheritor(baseClassOrigin, checkDeep)
}
}
@@ -11,8 +11,8 @@ import org.jetbrains.kotlin.analysis.api.lifetime.KtAlwaysAccessibleLifetimeToke
import org.jetbrains.kotlin.analysis.project.structure.KtModule
import org.jetbrains.kotlin.psi.KtElement
internal inline fun <R> analyseForLightClasses(context: KtElement, action: KtAnalysisSession.() -> R): R =
internal inline fun <R> analyzeForLightClasses(context: KtElement, action: KtAnalysisSession.() -> R): R =
analyze(context, KtAlwaysAccessibleLifetimeTokenFactory, action)
internal inline fun <R> analyseForLightClasses(useSiteKtModule: KtModule, crossinline action: KtAnalysisSession.() -> R): R =
internal inline fun <R> analyzeForLightClasses(useSiteKtModule: KtModule, crossinline action: KtAnalysisSession.() -> R): R =
analyze(useSiteKtModule, KtAlwaysAccessibleLifetimeTokenFactory, action)
@@ -66,22 +66,22 @@ internal fun createFirLightClassNoCache(classOrObject: KtClassOrObject): KtLight
val anonymousObject = classOrObject.parent as? KtObjectLiteralExpression
if (anonymousObject != null) {
return analyseForLightClasses(anonymousObject) {
return analyzeForLightClasses(anonymousObject) {
anonymousObject.getAnonymousObjectSymbol().createLightClassNoCache(anonymousObject.manager)
}
}
return when {
classOrObject is KtEnumEntry -> analyseForLightClasses(classOrObject) {
classOrObject is KtEnumEntry -> analyzeForLightClasses(classOrObject) {
lightClassForEnumEntry(classOrObject)
}
classOrObject.hasModifier(INLINE_KEYWORD) -> {
analyseForLightClasses(classOrObject) {
analyzeForLightClasses(classOrObject) {
classOrObject.getNamedClassOrObjectSymbol()?.let { FirLightInlineClass(it, classOrObject.manager) }
}
}
else -> {
analyseForLightClasses(classOrObject) {
analyzeForLightClasses(classOrObject) {
classOrObject.getClassOrObjectSymbol().createLightClassNoCache(classOrObject.manager)
}
}