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

[FIR] Remove redundant INITIALIZER_TYPE_MISMATCH introduced earlier

Browse Source
This commit is contained in:
Nikolay Lunyak
2024-02-09 11:19:51 +02:00
committed by Space Team
parent 389f02b016
commit fdb2b714c9
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInitializerTypeMismatchChecker.kt
+2 -1
View File
@@ -13,11 +13,12 @@ import org.jetbrains.kotlin.fir.analysis.checkers.checkTypeMismatch
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
import org.jetbrains.kotlin.fir.declarations.FirProperty import org.jetbrains.kotlin.fir.declarations.FirProperty
import org.jetbrains.kotlin.fir.expressions.FirComponentCall import org.jetbrains.kotlin.fir.expressions.FirComponentCall
import org.jetbrains.kotlin.fir.expressions.FirErrorExpression
import org.jetbrains.kotlin.fir.types.coneType import org.jetbrains.kotlin.fir.types.coneType
object FirInitializerTypeMismatchChecker : FirPropertyChecker(MppCheckerKind.Common) { object FirInitializerTypeMismatchChecker : FirPropertyChecker(MppCheckerKind.Common) {
override fun check(declaration: FirProperty, context: CheckerContext, reporter: DiagnosticReporter) { override fun check(declaration: FirProperty, context: CheckerContext, reporter: DiagnosticReporter) {
val initializer = declaration.initializer ?: return val initializer = declaration.initializer?.takeIf { it !is FirErrorExpression } ?: return
val source = declaration.source ?: return val source = declaration.source ?: return
if (source.elementType == KtNodeTypes.DESTRUCTURING_DECLARATION) return if (source.elementType == KtNodeTypes.DESTRUCTURING_DECLARATION) return
if (initializer is FirComponentCall) return if (initializer is FirComponentCall) return
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirValueParameterDefaultValueTypeMismatchChecker.kt
+2 -1
View File
@@ -10,11 +10,12 @@ import org.jetbrains.kotlin.fir.analysis.checkers.MppCheckerKind
import org.jetbrains.kotlin.fir.analysis.checkers.checkTypeMismatch import org.jetbrains.kotlin.fir.analysis.checkers.checkTypeMismatch
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.FirValueParameter
import org.jetbrains.kotlin.fir.expressions.FirErrorExpression
import org.jetbrains.kotlin.fir.types.coneType import org.jetbrains.kotlin.fir.types.coneType
object FirValueParameterDefaultValueTypeMismatchChecker : FirValueParameterChecker(MppCheckerKind.Common) { object FirValueParameterDefaultValueTypeMismatchChecker : FirValueParameterChecker(MppCheckerKind.Common) {
override fun check(declaration: FirValueParameter, context: CheckerContext, reporter: DiagnosticReporter) { override fun check(declaration: FirValueParameter, context: CheckerContext, reporter: DiagnosticReporter) {
val defaultValue = declaration.defaultValue ?: return val defaultValue = declaration.defaultValue?.takeIf { it !is FirErrorExpression } ?: return
val source = requireNotNull(declaration.source) val source = requireNotNull(declaration.source)
val parameterType = declaration.returnTypeRef.coneType val parameterType = declaration.returnTypeRef.coneType
compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.fir.kt
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
annotation class A(val a: IntArray = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>arrayOf(1)<!>) annotation class A(val a: IntArray = <!TYPE_MISMATCH!>arrayOf(1)<!>)
annotation class B(val a: IntArray = intArrayOf(1)) annotation class B(val a: IntArray = intArrayOf(1))
compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.fir.kt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ fun main() {
val h1 : String = <!INITIALIZER_TYPE_MISMATCH!>--v<!>; val h1 : String = <!INITIALIZER_TYPE_MISMATCH!>--v<!>;
val i : String = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>!true<!>; val i : String = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>!true<!>;
val j : String = <!INITIALIZER_TYPE_MISMATCH!>foo@ true<!>; val j : String = <!INITIALIZER_TYPE_MISMATCH!>foo@ true<!>;
val k : String = <!INITIALIZER_TYPE_MISMATCH!><!MULTIPLE_LABELS_ARE_FORBIDDEN!>foo@<!> bar@ true<!>; val k : String = <!MULTIPLE_LABELS_ARE_FORBIDDEN!>foo@<!> bar@ true;
val l : String = <!INITIALIZER_TYPE_MISMATCH!>-1<!>; val l : String = <!INITIALIZER_TYPE_MISMATCH!>-1<!>;
val m : String = <!INITIALIZER_TYPE_MISMATCH!>+1<!>; val m : String = <!INITIALIZER_TYPE_MISMATCH!>+1<!>;
} }