diff --git a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt index 9f4577dd376..f749cee58c2 100644 --- a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt +++ b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt @@ -332,7 +332,7 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") { val REPEATED_MODIFIER by error { parameter("modifier") } - val REDUNDANT_MODIFIER by error { + val REDUNDANT_MODIFIER by warning { parameter("redundantModifier") parameter("conflictingModifier") } @@ -340,7 +340,7 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") { parameter("deprecatedModifier") parameter("actualModifier") } - val DEPRECATED_MODIFIER_PAIR by error { + val DEPRECATED_MODIFIER_PAIR by warning { parameter("deprecatedModifier") parameter("conflictingModifier") } diff --git a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt index 58a22c7930f..eda3f8af45b 100644 --- a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt +++ b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt @@ -271,9 +271,9 @@ object FirErrors { // Modifiers val INAPPLICABLE_INFIX_MODIFIER by error0() val REPEATED_MODIFIER by error1() - val REDUNDANT_MODIFIER by error2() + val REDUNDANT_MODIFIER by warning2() val DEPRECATED_MODIFIER by warning2() - val DEPRECATED_MODIFIER_PAIR by error2() + val DEPRECATED_MODIFIER_PAIR by warning2() val DEPRECATED_MODIFIER_FOR_TARGET by warning2() val REDUNDANT_MODIFIER_FOR_TARGET by warning2() val INCOMPATIBLE_MODIFIERS by error2() diff --git a/compiler/testData/codegen/box/functions/defaultargs.kt b/compiler/testData/codegen/box/functions/defaultargs.kt index d24557a2b17..726a4d4db10 100644 --- a/compiler/testData/codegen/box/functions/defaultargs.kt +++ b/compiler/testData/codegen/box/functions/defaultargs.kt @@ -1,4 +1,3 @@ -// IGNORE_FIR_DIAGNOSTICS open abstract class B { fun foo(arg: Int = 239 + 1) : Int = arg } diff --git a/compiler/testData/codegen/box/functions/defaultargs4.kt b/compiler/testData/codegen/box/functions/defaultargs4.kt index 9b0ca9b5f02..b98b9a95d64 100644 --- a/compiler/testData/codegen/box/functions/defaultargs4.kt +++ b/compiler/testData/codegen/box/functions/defaultargs4.kt @@ -1,4 +1,3 @@ -// IGNORE_FIR_DIAGNOSTICS interface A { fun bar2(arg: Int = 239) : Int diff --git a/compiler/testData/codegen/box/functions/defaultargs5.kt b/compiler/testData/codegen/box/functions/defaultargs5.kt index 776736fb905..91dc6f6be40 100644 --- a/compiler/testData/codegen/box/functions/defaultargs5.kt +++ b/compiler/testData/codegen/box/functions/defaultargs5.kt @@ -1,4 +1,3 @@ -// IGNORE_FIR_DIAGNOSTICS open abstract class B { abstract fun foo2(arg: Int = 239) : Int } diff --git a/compiler/testData/codegen/box/super/innerClassLabeledSuper2.kt b/compiler/testData/codegen/box/super/innerClassLabeledSuper2.kt index c5fa3fb87a4..1a0bca8c437 100644 --- a/compiler/testData/codegen/box/super/innerClassLabeledSuper2.kt +++ b/compiler/testData/codegen/box/super/innerClassLabeledSuper2.kt @@ -1,4 +1,3 @@ -// IGNORE_FIR_DIAGNOSTICS //inspired by kt3492 interface BK { fun foo(): String