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

FIR: Rename parameters for (ASSIGNMENT|RESULT)_TYPE_MISMATCH.

Browse Source
This commit is contained in:
Mark Punzalan
2021-05-27 21:24:35 +00:00
committed by teamcityserver
parent b6b983aa2a
commit eddc590aaf
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt
+4 -4
View File
@@ -331,13 +331,13 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") {
} }
val ASSIGNMENT_TYPE_MISMATCH by error<KtExpression> { val ASSIGNMENT_TYPE_MISMATCH by error<KtExpression> {
parameter<ConeKotlinType>("expected") parameter<ConeKotlinType>("expectedType")
parameter<ConeKotlinType>("actual") parameter<ConeKotlinType>("actualType")
} }
val RESULT_TYPE_MISMATCH by error<KtExpression> { val RESULT_TYPE_MISMATCH by error<KtExpression> {
parameter<ConeKotlinType>("expected") parameter<ConeKotlinType>("expectedType")
parameter<ConeKotlinType>("actual") parameter<ConeKotlinType>("actualType")
} }
val MANY_LAMBDA_EXPRESSION_ARGUMENTS by error<KtValueArgument>() val MANY_LAMBDA_EXPRESSION_ARGUMENTS by error<KtValueArgument>()
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnostics.kt
+4 -4
View File
@@ -762,14 +762,14 @@ sealed class KtFirDiagnostic<PSI: PsiElement> : KtDiagnosticWithPsi<PSI> {
abstract class AssignmentTypeMismatch : KtFirDiagnostic<KtExpression>() { abstract class AssignmentTypeMismatch : KtFirDiagnostic<KtExpression>() {
override val diagnosticClass get() = AssignmentTypeMismatch::class override val diagnosticClass get() = AssignmentTypeMismatch::class
abstract val expected: KtType abstract val expectedType: KtType
abstract val actual: KtType abstract val actualType: KtType
} }
abstract class ResultTypeMismatch : KtFirDiagnostic<KtExpression>() { abstract class ResultTypeMismatch : KtFirDiagnostic<KtExpression>() {
override val diagnosticClass get() = ResultTypeMismatch::class override val diagnosticClass get() = ResultTypeMismatch::class
abstract val expected: KtType abstract val expectedType: KtType
abstract val actual: KtType abstract val actualType: KtType
} }
abstract class ManyLambdaExpressionArguments : KtFirDiagnostic<KtValueArgument>() { abstract class ManyLambdaExpressionArguments : KtFirDiagnostic<KtValueArgument>() {
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnosticsImpl.kt
+4 -4
View File
@@ -1224,8 +1224,8 @@ internal class NamedParameterNotFoundImpl(
} }
internal class AssignmentTypeMismatchImpl( internal class AssignmentTypeMismatchImpl(
override val expected: KtType, override val expectedType: KtType,
override val actual: KtType, override val actualType: KtType,
firDiagnostic: FirPsiDiagnostic<*>, firDiagnostic: FirPsiDiagnostic<*>,
override val token: ValidityToken, override val token: ValidityToken,
) : KtFirDiagnostic.AssignmentTypeMismatch(), KtAbstractFirDiagnostic<KtExpression> { ) : KtFirDiagnostic.AssignmentTypeMismatch(), KtAbstractFirDiagnostic<KtExpression> {
@@ -1233,8 +1233,8 @@ internal class AssignmentTypeMismatchImpl(
} }
internal class ResultTypeMismatchImpl( internal class ResultTypeMismatchImpl(
override val expected: KtType, override val expectedType: KtType,
override val actual: KtType, override val actualType: KtType,
firDiagnostic: FirPsiDiagnostic<*>, firDiagnostic: FirPsiDiagnostic<*>,
override val token: ValidityToken, override val token: ValidityToken,
) : KtFirDiagnostic.ResultTypeMismatch(), KtAbstractFirDiagnostic<KtExpression> { ) : KtFirDiagnostic.ResultTypeMismatch(), KtAbstractFirDiagnostic<KtExpression> {