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

FIR: add receiver expression to UNSAFE_CALL diagnostic and its variances

Browse Source
This commit is contained in:
Tianyu Geng
2021-04-30 11:57:26 -07:00
committed by Ilya Kirillov
parent 9106ae4f5f
commit 00ffa69cb3
7 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt
+1
View File
@@ -2035,6 +2035,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
add(FirErrors.UNSAFE_CALL) { firDiagnostic ->
UnsafeCallImpl(
firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a),
firDiagnostic.b?.source?.psi as? KtExpression,
firDiagnostic as FirPsiDiagnostic<*>,
token,
)
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnostics.kt
+5 -4
View File
@@ -1430,6 +1430,7 @@ sealed class KtFirDiagnostic<PSI: PsiElement> : KtDiagnosticWithPsi<PSI> {
abstract class UnsafeCall : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = UnsafeCall::class
abstract val receiverType: KtType
abstract val receiverExpression: KtExpression?
}
abstract class UnsafeImplicitInvokeCall : KtFirDiagnostic<PsiElement>() {
@@ -1439,16 +1440,16 @@ sealed class KtFirDiagnostic<PSI: PsiElement> : KtDiagnosticWithPsi<PSI> {
abstract class UnsafeInfixCall : KtFirDiagnostic<KtExpression>() {
override val diagnosticClass get() = UnsafeInfixCall::class
abstract val lhs: KtExpression
abstract val receiverExpression: KtExpression
abstract val operator: String
abstract val rhs: KtExpression
abstract val argumentExpression: KtExpression
}
abstract class UnsafeOperatorCall : KtFirDiagnostic<KtExpression>() {
override val diagnosticClass get() = UnsafeOperatorCall::class
abstract val lhs: KtExpression
abstract val receiverExpression: KtExpression
abstract val operator: String
abstract val rhs: KtExpression
abstract val argumentExpression: KtExpression
}
abstract class IteratorOnNullable : KtFirDiagnostic<KtExpression>() {
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnosticsImpl.kt
+5 -4
View File
@@ -2321,6 +2321,7 @@ internal class WrongImpliesConditionImpl(
internal class UnsafeCallImpl(
override val receiverType: KtType,
override val receiverExpression: KtExpression?,
firDiagnostic: FirPsiDiagnostic<*>,
override val token: ValidityToken,
) : KtFirDiagnostic.UnsafeCall(), KtAbstractFirDiagnostic<PsiElement> {
@@ -2336,9 +2337,9 @@ internal class UnsafeImplicitInvokeCallImpl(
}
internal class UnsafeInfixCallImpl(
override val lhs: KtExpression,
override val receiverExpression: KtExpression,
override val operator: String,
override val rhs: KtExpression,
override val argumentExpression: KtExpression,
firDiagnostic: FirPsiDiagnostic<*>,
override val token: ValidityToken,
) : KtFirDiagnostic.UnsafeInfixCall(), KtAbstractFirDiagnostic<KtExpression> {
@@ -2346,9 +2347,9 @@ internal class UnsafeInfixCallImpl(
}
internal class UnsafeOperatorCallImpl(
override val lhs: KtExpression,
override val receiverExpression: KtExpression,
override val operator: String,
override val rhs: KtExpression,
override val argumentExpression: KtExpression,
firDiagnostic: FirPsiDiagnostic<*>,
override val token: ValidityToken,
) : KtFirDiagnostic.UnsafeOperatorCall(), KtAbstractFirDiagnostic<KtExpression> {