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

LL API: remove unused resolve api

Browse Source
This commit is contained in:
Ilya Kirillov
2022-01-20 18:59:09 +01:00
parent 7a0d1ce0d1
commit 75ae37fcbf
15 changed files with 13 additions and 1472 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/KtFirExpressionTypeProvider.kt
+1 -1
View File
@@ -66,7 +66,7 @@ internal class KtFirExpressionTypeProvider(
}
}
is FirExpression -> fir.typeRef.coneType.asKtType()
is FirNamedReference -> fir.getReferencedElementType(firResolveState).asKtType()
is FirNamedReference -> fir.getReferencedElementType().asKtType()
is FirStatement -> with(analysisSession) { builtinTypes.UNIT }
is FirTypeRef, is FirImport, is FirPackageDirective, is FirLabel -> null
// For invalid code like the following,
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/utils/firUtils.kt
+2 -5
View File
@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.analysis.api.fir.getCandidateSymbols
import org.jetbrains.kotlin.analysis.api.types.KtTypeNullability
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.withFirDeclaration
import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.ResolveType
import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.analysis.checkers.classKind
@@ -52,7 +51,7 @@ internal fun KtExpression.unwrap(): KtExpression {
} ?: this
}
internal fun FirNamedReference.getReferencedElementType(resolveState: FirModuleResolveState): ConeKotlinType {
internal fun FirNamedReference.getReferencedElementType(): ConeKotlinType {
val symbols = when (this) {
is FirResolvedNamedReference -> listOf(resolvedSymbol)
is FirErrorNamedReference -> getCandidateSymbols()
@@ -61,9 +60,7 @@ internal fun FirNamedReference.getReferencedElementType(resolveState: FirModuleR
val firCallableDeclaration = symbols.singleOrNull()?.fir as? FirCallableDeclaration
?: return ConeClassErrorType(ConeUnresolvedNameError(name))
return firCallableDeclaration.withFirDeclaration(ResolveType.CallableReturnType, resolveState) {
it.returnTypeRef.coneType
}
return firCallableDeclaration.symbol.resolvedReturnType
}
internal fun KtTypeNullability.toConeNullability() = when (this) {