[FIR] KT-57085: Ignore the diagnostic case in `@Suppress()`
^KT-57085 Fixed
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
index 3130b53..01a50a9 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
@@ -526,6 +526,12 @@
}
@Test
+ @TestMetadata("kt57085.kt")
+ public void testKt57085() throws Exception {
+ runTest("compiler/testData/diagnostics/tests/kt57085.kt");
+ }
+
+ @Test
@TestMetadata("LValueAssignment.kt")
public void testLValueAssignment() throws Exception {
runTest("compiler/testData/diagnostics/tests/LValueAssignment.kt");
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
index 86d1df8..1c757ce 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
@@ -526,6 +526,12 @@
}
@Test
+ @TestMetadata("kt57085.kt")
+ public void testKt57085() throws Exception {
+ runTest("compiler/testData/diagnostics/tests/kt57085.kt");
+ }
+
+ @Test
@TestMetadata("LValueAssignment.kt")
public void testLValueAssignment() throws Exception {
runTest("compiler/testData/diagnostics/tests/LValueAssignment.kt");
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
index 1ab62e8..dcb856a 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
@@ -526,6 +526,12 @@
}
@Test
+ @TestMetadata("kt57085.kt")
+ public void testKt57085() throws Exception {
+ runTest("compiler/testData/diagnostics/tests/kt57085.kt");
+ }
+
+ @Test
@TestMetadata("LValueAssignment.kt")
public void testLValueAssignment() throws Exception {
runTest("compiler/testData/diagnostics/tests/LValueAssignment.kt");
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollector.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollector.kt
index eebb64c..e3da241 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollector.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollector.kt
@@ -42,6 +42,11 @@
private val SUPPRESS_NAMES_NAME = Name.identifier("names")
+ private fun correctDiagnosticCase(diagnostic: String): String = when (diagnostic) {
+ SUPPRESS_ALL_INFOS, SUPPRESS_ALL_WARNINGS, SUPPRESS_ALL_ERRORS -> diagnostic
+ else -> diagnostic.uppercase()
+ }
+
fun getDiagnosticsSuppressedForContainer(annotationContainer: FirAnnotationContainer): List<String>? {
var result: MutableList<String>? = null
@@ -56,7 +61,7 @@
if (result == null) {
result = mutableListOf()
}
- result.add(value)
+ result.add(correctDiagnosticCase(value))
}
}
diff --git a/compiler/testData/diagnostics/tests/kt57085.kt b/compiler/testData/diagnostics/tests/kt57085.kt
new file mode 100644
index 0000000..2d39a43
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/kt57085.kt
@@ -0,0 +1,9 @@
+// FIR_IDENTICAL
+// WITH_STDLIB
+
+@Suppress("inapplicable_jvm_name")
+interface Factory {
+ @get:JvmName("supportsMultilevelIntrospection") // K1: ok, K2: INAPPLICABLE_JVM_NAME
+ val supportsMultilevelIntrospection: Boolean
+ get() = false
+}
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index 5c8c06c..f4400d0 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -526,6 +526,12 @@
}
@Test
+ @TestMetadata("kt57085.kt")
+ public void testKt57085() throws Exception {
+ runTest("compiler/testData/diagnostics/tests/kt57085.kt");
+ }
+
+ @Test
@TestMetadata("LValueAssignment.kt")
public void testLValueAssignment() throws Exception {
runTest("compiler/testData/diagnostics/tests/LValueAssignment.kt");
