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

[FIR] Use resolvedType instead of coneTypeOrNull in tests

Browse Source 
#KT-61367
This commit is contained in:
Kirill Rakhman
2023-09-08 17:45:16 +02:00
committed by Space Team
parent 5d6affc38d
commit e8731f3f31
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt
+5 -6
View File
@@ -212,7 +212,7 @@ class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(tes
val calleeDeclaration = element.calleeReference.toResolvedCallableSymbol() ?: return
val isInvokeCallWithDynamicReceiver = calleeDeclaration.name == OperatorNameConventions.INVOKE
&& element is FirQualifiedAccessExpression
&& element.dispatchReceiver?.coneTypeOrNull?.isFunctionTypeWithDynamicReceiver(firFile.moduleData.session) == true
&& element.dispatchReceiver?.resolvedType?.isFunctionTypeWithDynamicReceiver(firFile.moduleData.session) == true
if (calleeDeclaration.origin !is FirDeclarationOrigin.DynamicScope && !isInvokeCallWithDynamicReceiver) {
return
@@ -293,14 +293,13 @@ class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(tes
private fun DebugDiagnosticConsumer.reportExpressionTypeDiagnostic(element: FirExpression) {
report(DebugInfoDiagnosticFactory1.EXPRESSION_TYPE, element) {
val type = element.resolvedType
val originalType = (element as? FirSmartCastExpression)?.takeIf { it.isStable }?.originalExpression?.resolvedType
val type = element.coneTypeSafe<ConeKotlinType>()
val originalType = (element as? FirSmartCastExpression)?.takeIf { it.isStable }?.originalExpression?.coneTypeOrNull
if (type != null && originalType != null) {
if (originalType != null) {
"${originalType.renderForDebugInfo()} & ${type.renderForDebugInfo()}"
} else {
type?.renderForDebugInfo() ?: "Type is unknown"
type.renderForDebugInfo()
}
}
}
compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirResolveBench.kt
+2 -2
View File
@@ -275,7 +275,7 @@ class FirResolveBench(val withProgress: Boolean, val listener: BenchListener? =
override fun visitFunctionCall(functionCall: FirFunctionCall) {
val callee = functionCall.calleeReference
val type = functionCall.coneTypeOrNull
val type = functionCall.resolvedType
if (type is ConeErrorType) {
errorFunctionCallTypes++
val psi = callee.psi
@@ -289,7 +289,7 @@ class FirResolveBench(val withProgress: Boolean, val listener: BenchListener? =
override fun visitQualifiedAccessExpression(qualifiedAccessExpression: FirQualifiedAccessExpression) {
val callee = qualifiedAccessExpression.calleeReference
val type = qualifiedAccessExpression.coneTypeOrNull
val type = qualifiedAccessExpression.resolvedType
if (type is ConeErrorType) {
errorQualifiedAccessTypes++
val psi = callee.psi