[kotlin] Fix test data after #KT-70709

GitOrigin-RevId: 969c54e9ea4a43f49902d14f33cb510b933fa0ce

plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/AbstractK2ComposeCompilerPluginCheckerTest.kt

@@ -8,7 +8,12 @@ import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources
 import java.io.File
 
 abstract class AbstractK2ComposeCompilerPluginCheckerTest : AbstractK2BundledCompilerPluginsHighlightingMetaInfoTest() {
-    override fun highlightingFileNameSuffix(testKtFile: File): String = HIGHLIGHTING_EXTENSION
+    override fun highlightingFileNameSuffix(testKtFile: File): String {
+        if (testKtFile.resolveSibling("${testKtFile.name}.$HIGHLIGHTING_FIR_EXTENSION").exists()) {
+            return HIGHLIGHTING_FIR_EXTENSION
+        }
+        return HIGHLIGHTING_EXTENSION
+    }
 
     override fun getDefaultProjectDescriptor(): ProjectDescriptorWithStdlibSources =
         ProjectDescriptorWithStdlibSourcesAndComposeRuntime

plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/AbstractK2HighlightingMetaInfoTest.kt

@@ -23,7 +23,7 @@ import java.io.File
 
 abstract class AbstractK2HighlightingMetaInfoTest : AbstractHighlightingMetaInfoTest(), KMPTest {
 
-    private val HIGHLIGHTING_FIR_EXTENSION = "highlighting.fir"
+    protected val HIGHLIGHTING_FIR_EXTENSION = "highlighting.fir"
 
     override fun getDefaultProjectDescriptor() = ProjectDescriptorWithStdlibSources.getInstanceWithStdlibSources()
 

plugins/kotlin/idea/tests/testData/highlighterMetaInfoWithComposeCompilerCheckers/MissingComposableOnOverride.kt.highlighting.fir

@@ -0,0 +1,32 @@
+// COMPILER_ARGUMENTS: -Xplugin=$TEST_DIR$/compose_fake_plugin.jar
+// FILE: main.kt
+// ALLOW_ERRORS
+import androidx.compose.runtime.Composable
+
+interface Foo {
+    @Composable
+    fun composableFunction(param: Boolean): Boolean
+    fun nonComposableFunction(param: Boolean): Boolean
+    val nonComposableProperty: Boolean
+}
+
+object FakeFoo : Foo {
+    override <!HIGHLIGHTING("severity='ERROR'; descr='[CONFLICTING_OVERLOADS] Conflicting overloads: fun composableFunction(param: Boolean): Boolean fun composableFunction(param: Boolean): Boolean'")!>fun composableFunction(param: Boolean)<!> = true
+    @Composable override <!HIGHLIGHTING("severity='ERROR'; descr='[CONFLICTING_OVERLOADS] Conflicting overloads: fun nonComposableFunction(param: Boolean): Boolean fun nonComposableFunction(param: Boolean): Boolean'")!>fun nonComposableFunction(param: Boolean)<!> = true
+    override val nonComposableProperty: Boolean @Composable <!HIGHLIGHTING("severity='ERROR'; descr='[CONFLICTING_OVERLOADS] Conflicting overloads: get(): Boolean get(): Boolean'")!>get()<!> = true
+}
+
+interface Bar {
+    @Composable
+    fun composableFunction(param: Boolean): Boolean
+    @get:Composable val composableProperty: Boolean
+    fun nonComposableFunction(param: Boolean): Boolean
+    val nonComposableProperty: Boolean
+}
+
+object FakeBar : Bar {
+    override <!HIGHLIGHTING("severity='ERROR'; descr='[CONFLICTING_OVERLOADS] Conflicting overloads: fun composableFunction(param: Boolean): Boolean fun composableFunction(param: Boolean): Boolean'")!>fun composableFunction(param: Boolean)<!> = true
+    override <!HIGHLIGHTING("severity='ERROR'; descr='[CONFLICTING_OVERLOADS] Conflicting overloads: get(): Boolean get(): Boolean'")!>val composableProperty: Boolean<!> = true
+    @Composable override <!HIGHLIGHTING("severity='ERROR'; descr='[CONFLICTING_OVERLOADS] Conflicting overloads: fun nonComposableFunction(param: Boolean): Boolean fun nonComposableFunction(param: Boolean): Boolean'")!>fun nonComposableFunction(param: Boolean)<!> = true
+    override val nonComposableProperty: Boolean @Composable <!HIGHLIGHTING("severity='ERROR'; descr='[CONFLICTING_OVERLOADS] Conflicting overloads: get(): Boolean get(): Boolean'")!>get()<!> = true
+}

plugins/kotlin/idea/tests/testData/highlighterMetaInfoWithComposeCompilerCheckers/MissingOverrideComposableLambda.kt.highlighting.fir

@@ -0,0 +1,8 @@
+// COMPILER_ARGUMENTS: -Xplugin=$TEST_DIR$/compose_fake_plugin.jar
+// FILE: main.kt
+// ALLOW_ERRORS
+import androidx.compose.runtime.Composable
+
+class Impl : @Composable () -> Unit {
+    override <!HIGHLIGHTING("severity='ERROR'; descr='[CONFLICTING_OVERLOADS] Conflicting overloads: fun invoke(): Unit fun invoke(): R'")!>fun invoke()<!> {}
+}

plugins/kotlin/idea/tests/testData/highlighterMetaInfoWithComposeCompilerCheckers/MultipleOverrideLambda.kt.highlighting.fir

@@ -0,0 +1,9 @@
+// COMPILER_ARGUMENTS: -Xplugin=$TEST_DIR$/compose_fake_plugin.jar
+// FILE: main.kt
+// ALLOW_ERRORS
+import androidx.compose.runtime.Composable
+
+class Impl : <!HIGHLIGHTING("severity='ERROR'; descr='[MIXING_FUNCTIONAL_KINDS_IN_SUPERTYPES] Mixing supertypes of different functional kinds ([Function, @Composable]) is not allowed.'")!>() -> Unit, @Composable (Int) -> Unit<!> {
+    @Composable override <!HIGHLIGHTING("severity='ERROR'; descr='[CONFLICTING_OVERLOADS] Conflicting overloads: fun invoke(): Unit fun invoke(): R'")!>fun invoke()<!> {}
+    @Composable override fun invoke(p0: Int) {}
+}

plugins/kotlin/idea/tests/testData/highlighterMetaInfoWithComposeCompilerCheckers/WrongOverrideLambda.kt.highlighting.fir

@@ -0,0 +1,8 @@
+// COMPILER_ARGUMENTS: -Xplugin=$TEST_DIR$/compose_fake_plugin.jar
+// FILE: main.kt
+// ALLOW_ERRORS
+import androidx.compose.runtime.Composable
+
+class Impl : () -> Unit {
+    @Composable override <!HIGHLIGHTING("severity='ERROR'; descr='[CONFLICTING_OVERLOADS] Conflicting overloads: fun invoke(): Unit fun invoke(): R'")!>fun invoke()<!> {}
+}

plugins/kotlin/idea/tests/testData/quickfix/addInitializer/mustBeInitializedOrBeFinalWarning.kt

@@ -2,7 +2,7 @@
 // ERROR: Val cannot be reassigned
 // COMPILER_ARGUMENTS: -XXLanguage:-ProhibitOpenValDeferredInitialization
 open class Foo {
-    <caret>open val foo: Int
+    open <caret>val foo: Int
         get() = field
 
     init {