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

fix compilation and testData after rebase

Browse Source 
^KT-54417
This commit is contained in:
Dmitrii Gridin
2022-11-14 12:16:29 +01:00
committed by Space Team
parent d0a420fad9
commit 032026278c
62 changed files with 554 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolInfoProvider.kt
+3 -3
View File
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.analysis.api.fir.symbols.KtFirSyntheticJavaPropertyS
import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken
import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol
import org.jetbrains.kotlin.analysis.utils.errors.requireIsInstance
import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
import org.jetbrains.kotlin.fir.declarations.FirProperty
@@ -34,8 +35,8 @@ internal class KtFirSymbolInfoProvider(
private val apiVersion = analysisSession.useSiteSession.languageVersionSettings.apiVersion
override fun getDeprecation(symbol: KtSymbol): DeprecationInfo? {
if (symbol is KtFirBackingFieldSymbol || symbol is KtFirPackageSymbol) return null
require(symbol is KtFirSymbol<*>)
if (symbol is KtFirBackingFieldSymbol || symbol is KtFirPackageSymbol || symbol is KtReceiverParameterSymbol) return null
require(symbol is KtFirSymbol<*>) { "${this::class}" }
return when (val firSymbol = symbol.firSymbol) {
is FirPropertySymbol -> {
firSymbol.getDeprecationForCallSite(apiVersion, AnnotationUseSiteTarget.PROPERTY)
@@ -44,7 +45,6 @@ internal class KtFirSymbolInfoProvider(
firSymbol.getDeprecationForCallSite(apiVersion)
}
}
}
override fun getDeprecation(symbol: KtSymbol, annotationUseSiteTarget: AnnotationUseSiteTarget?): DeprecationInfo? {
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/utils/ktSymbolUtils.kt
+5 -2
View File
@@ -43,5 +43,8 @@ fun FirBasedSymbol<*>.getContainingKtModule(firResolveSession: LLFirResolveSessi
return target.llFirModuleData.ktModule
}
fun KtSymbol.getContainingKtModule(firResolveSession: LLFirResolveSession): KtModule =
firSymbol.getContainingKtModule(firResolveSession)
fun KtSymbol.getContainingKtModule(firResolveSession: LLFirResolveSession): KtModule = when (this) {
is KtFirSymbol<*> -> firSymbol.getContainingKtModule(firResolveSession)
is KtReceiverParameterSymbol -> owningCallableSymbol.getContainingKtModule(firResolveSession)
else -> TODO("${this::class}")
}