[Test] Move some MPP diagnostic tests into a dedicated folder

All those tests check different diagnostics on class scopes

analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java

@@ -24677,54 +24677,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
                 runTest("compiler/testData/diagnostics/tests/multiplatform/actualClassDelegationWithImplicitType.kt");
             }
 
-            @Test
-            @TestMetadata("actualFakeOverride.kt")
-            public void testActualFakeOverride() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverrideVirtual.kt")
-            public void testActualFakeOverrideVirtual() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverrideVirtual.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverride_defaultParamsIncompatibility.kt")
-            public void testActualFakeOverride_defaultParamsIncompatibility() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_defaultParamsIncompatibility.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt")
-            public void testActualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt")
-            public void testActualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverride_substitutionFakeOverride.kt")
-            public void testActualFakeOverride_substitutionFakeOverride() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_substitutionFakeOverride.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverride_transitiveFakeOverrides_compatible.kt")
-            public void testActualFakeOverride_transitiveFakeOverrides_compatible() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_transitiveFakeOverrides_compatible.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverride_transitiveFakeOverrides_incompatible.kt")
-            public void testActualFakeOverride_transitiveFakeOverrides_incompatible() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_transitiveFakeOverrides_incompatible.kt");
-            }
-
             @Test
             @TestMetadata("actualMissingConstructor.kt")
             public void testActualMissingConstructor() throws Exception {
@@ -24820,18 +24772,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
                 runTest("compiler/testData/diagnostics/tests/multiplatform/checkNoActualForExpectInLastModule.kt");
             }
 
-            @Test
-            @TestMetadata("defaultParams_inheritanceByDelegation_negative.kt")
-            public void testDefaultParams_inheritanceByDelegation_negative() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/defaultParams_inheritanceByDelegation_negative.kt");
-            }
-
-            @Test
-            @TestMetadata("defaultParams_inheritanceByDelegation_positive.kt")
-            public void testDefaultParams_inheritanceByDelegation_positive() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/defaultParams_inheritanceByDelegation_positive.kt");
-            }
-
             @Test
             @TestMetadata("expectAbstractToString.kt")
             public void testExpectAbstractToString() throws Exception {
@@ -24934,18 +24874,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
                 runTest("compiler/testData/diagnostics/tests/multiplatform/implFakeOverride.kt");
             }
 
-            @Test
-            @TestMetadata("implicitActualFakeOverride_AbstractMap.kt")
-            public void testImplicitActualFakeOverride_AbstractMap() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/implicitActualFakeOverride_AbstractMap.kt");
-            }
-
-            @Test
-            @TestMetadata("implicitActualFakeOverride_simple.kt")
-            public void testImplicitActualFakeOverride_simple() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/implicitActualFakeOverride_simple.kt");
-            }
-
             @Test
             @TestMetadata("incDecOperatorsInExpectClass.kt")
             public void testIncDecOperatorsInExpectClass() throws Exception {
@@ -25006,30 +24934,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
                 runTest("compiler/testData/diagnostics/tests/multiplatform/kt64166.kt");
             }
 
-            @Test
-            @TestMetadata("manyImplMemberNotImplemented.kt")
-            public void testManyImplMemberNotImplemented() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/manyImplMemberNotImplemented.kt");
-            }
-
-            @Test
-            @TestMetadata("manyInterfacesMemberNotImplemented.kt")
-            public void testManyInterfacesMemberNotImplemented() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/manyInterfacesMemberNotImplemented.kt");
-            }
-
             @Test
             @TestMetadata("modifierApplicability.kt")
             public void testModifierApplicability() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/multiplatform/modifierApplicability.kt");
             }
 
-            @Test
-            @TestMetadata("multipleExpectInterfacesImplementation.kt")
-            public void testMultipleExpectInterfacesImplementation() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/multipleExpectInterfacesImplementation.kt");
-            }
-
             @Test
             @TestMetadata("namedArguments.kt")
             public void testNamedArguments() throws Exception {
@@ -26672,6 +26582,106 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
                 }
             }
 
+            @Nested
+            @TestMetadata("compiler/testData/diagnostics/tests/multiplatform/scopes")
+            @TestDataPath("$PROJECT_ROOT")
+            public class Scopes {
+                @Test
+                @TestMetadata("actualFakeOverride.kt")
+                public void testActualFakeOverride() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverrideVirtual.kt")
+                public void testActualFakeOverrideVirtual() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverrideVirtual.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverride_defaultParamsIncompatibility.kt")
+                public void testActualFakeOverride_defaultParamsIncompatibility() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_defaultParamsIncompatibility.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt")
+                public void testActualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt")
+                public void testActualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverride_substitutionFakeOverride.kt")
+                public void testActualFakeOverride_substitutionFakeOverride() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_substitutionFakeOverride.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverride_transitiveFakeOverrides_compatible.kt")
+                public void testActualFakeOverride_transitiveFakeOverrides_compatible() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_transitiveFakeOverrides_compatible.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverride_transitiveFakeOverrides_incompatible.kt")
+                public void testActualFakeOverride_transitiveFakeOverrides_incompatible() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_transitiveFakeOverrides_incompatible.kt");
+                }
+
+                @Test
+                public void testAllFilesPresentInScopes() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/multiplatform/scopes"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
+                }
+
+                @Test
+                @TestMetadata("defaultParams_inheritanceByDelegation_negative.kt")
+                public void testDefaultParams_inheritanceByDelegation_negative() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/defaultParams_inheritanceByDelegation_negative.kt");
+                }
+
+                @Test
+                @TestMetadata("defaultParams_inheritanceByDelegation_positive.kt")
+                public void testDefaultParams_inheritanceByDelegation_positive() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/defaultParams_inheritanceByDelegation_positive.kt");
+                }
+
+                @Test
+                @TestMetadata("implicitActualFakeOverride_AbstractMap.kt")
+                public void testImplicitActualFakeOverride_AbstractMap() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/implicitActualFakeOverride_AbstractMap.kt");
+                }
+
+                @Test
+                @TestMetadata("implicitActualFakeOverride_simple.kt")
+                public void testImplicitActualFakeOverride_simple() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/implicitActualFakeOverride_simple.kt");
+                }
+
+                @Test
+                @TestMetadata("manyImplMemberNotImplemented.kt")
+                public void testManyImplMemberNotImplemented() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/manyImplMemberNotImplemented.kt");
+                }
+
+                @Test
+                @TestMetadata("manyInterfacesMemberNotImplemented.kt")
+                public void testManyInterfacesMemberNotImplemented() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/manyInterfacesMemberNotImplemented.kt");
+                }
+
+                @Test
+                @TestMetadata("multipleExpectInterfacesImplementation.kt")
+                public void testMultipleExpectInterfacesImplementation() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/multipleExpectInterfacesImplementation.kt");
+                }
+            }
+
             @Nested
             @TestMetadata("compiler/testData/diagnostics/tests/multiplatform/smartCasts")
             @TestDataPath("$PROJECT_ROOT")

analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java

@@ -24677,54 +24677,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
                 runTest("compiler/testData/diagnostics/tests/multiplatform/actualClassDelegationWithImplicitType.kt");
             }
 
-            @Test
-            @TestMetadata("actualFakeOverride.kt")
-            public void testActualFakeOverride() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverrideVirtual.kt")
-            public void testActualFakeOverrideVirtual() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverrideVirtual.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverride_defaultParamsIncompatibility.kt")
-            public void testActualFakeOverride_defaultParamsIncompatibility() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_defaultParamsIncompatibility.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt")
-            public void testActualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt")
-            public void testActualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverride_substitutionFakeOverride.kt")
-            public void testActualFakeOverride_substitutionFakeOverride() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_substitutionFakeOverride.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverride_transitiveFakeOverrides_compatible.kt")
-            public void testActualFakeOverride_transitiveFakeOverrides_compatible() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_transitiveFakeOverrides_compatible.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverride_transitiveFakeOverrides_incompatible.kt")
-            public void testActualFakeOverride_transitiveFakeOverrides_incompatible() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_transitiveFakeOverrides_incompatible.kt");
-            }
-
             @Test
             @TestMetadata("actualMissingConstructor.kt")
             public void testActualMissingConstructor() throws Exception {
@@ -24820,18 +24772,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
                 runTest("compiler/testData/diagnostics/tests/multiplatform/checkNoActualForExpectInLastModule.kt");
             }
 
-            @Test
-            @TestMetadata("defaultParams_inheritanceByDelegation_negative.kt")
-            public void testDefaultParams_inheritanceByDelegation_negative() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/defaultParams_inheritanceByDelegation_negative.kt");
-            }
-
-            @Test
-            @TestMetadata("defaultParams_inheritanceByDelegation_positive.kt")
-            public void testDefaultParams_inheritanceByDelegation_positive() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/defaultParams_inheritanceByDelegation_positive.kt");
-            }
-
             @Test
             @TestMetadata("expectAbstractToString.kt")
             public void testExpectAbstractToString() throws Exception {
@@ -24934,18 +24874,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
                 runTest("compiler/testData/diagnostics/tests/multiplatform/implFakeOverride.kt");
             }
 
-            @Test
-            @TestMetadata("implicitActualFakeOverride_AbstractMap.kt")
-            public void testImplicitActualFakeOverride_AbstractMap() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/implicitActualFakeOverride_AbstractMap.kt");
-            }
-
-            @Test
-            @TestMetadata("implicitActualFakeOverride_simple.kt")
-            public void testImplicitActualFakeOverride_simple() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/implicitActualFakeOverride_simple.kt");
-            }
-
             @Test
             @TestMetadata("incDecOperatorsInExpectClass.kt")
             public void testIncDecOperatorsInExpectClass() throws Exception {
@@ -25006,30 +24934,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
                 runTest("compiler/testData/diagnostics/tests/multiplatform/kt64166.kt");
             }
 
-            @Test
-            @TestMetadata("manyImplMemberNotImplemented.kt")
-            public void testManyImplMemberNotImplemented() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/manyImplMemberNotImplemented.kt");
-            }
-
-            @Test
-            @TestMetadata("manyInterfacesMemberNotImplemented.kt")
-            public void testManyInterfacesMemberNotImplemented() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/manyInterfacesMemberNotImplemented.kt");
-            }
-
             @Test
             @TestMetadata("modifierApplicability.kt")
             public void testModifierApplicability() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/multiplatform/modifierApplicability.kt");
             }
 
-            @Test
-            @TestMetadata("multipleExpectInterfacesImplementation.kt")
-            public void testMultipleExpectInterfacesImplementation() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/multipleExpectInterfacesImplementation.kt");
-            }
-
             @Test
             @TestMetadata("namedArguments.kt")
             public void testNamedArguments() throws Exception {
@@ -26672,6 +26582,106 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
                 }
             }
 
+            @Nested
+            @TestMetadata("compiler/testData/diagnostics/tests/multiplatform/scopes")
+            @TestDataPath("$PROJECT_ROOT")
+            public class Scopes {
+                @Test
+                @TestMetadata("actualFakeOverride.kt")
+                public void testActualFakeOverride() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverrideVirtual.kt")
+                public void testActualFakeOverrideVirtual() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverrideVirtual.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverride_defaultParamsIncompatibility.kt")
+                public void testActualFakeOverride_defaultParamsIncompatibility() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_defaultParamsIncompatibility.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt")
+                public void testActualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt")
+                public void testActualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverride_substitutionFakeOverride.kt")
+                public void testActualFakeOverride_substitutionFakeOverride() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_substitutionFakeOverride.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverride_transitiveFakeOverrides_compatible.kt")
+                public void testActualFakeOverride_transitiveFakeOverrides_compatible() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_transitiveFakeOverrides_compatible.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverride_transitiveFakeOverrides_incompatible.kt")
+                public void testActualFakeOverride_transitiveFakeOverrides_incompatible() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_transitiveFakeOverrides_incompatible.kt");
+                }
+
+                @Test
+                public void testAllFilesPresentInScopes() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/multiplatform/scopes"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
+                }
+
+                @Test
+                @TestMetadata("defaultParams_inheritanceByDelegation_negative.kt")
+                public void testDefaultParams_inheritanceByDelegation_negative() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/defaultParams_inheritanceByDelegation_negative.kt");
+                }
+
+                @Test
+                @TestMetadata("defaultParams_inheritanceByDelegation_positive.kt")
+                public void testDefaultParams_inheritanceByDelegation_positive() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/defaultParams_inheritanceByDelegation_positive.kt");
+                }
+
+                @Test
+                @TestMetadata("implicitActualFakeOverride_AbstractMap.kt")
+                public void testImplicitActualFakeOverride_AbstractMap() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/implicitActualFakeOverride_AbstractMap.kt");
+                }
+
+                @Test
+                @TestMetadata("implicitActualFakeOverride_simple.kt")
+                public void testImplicitActualFakeOverride_simple() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/implicitActualFakeOverride_simple.kt");
+                }
+
+                @Test
+                @TestMetadata("manyImplMemberNotImplemented.kt")
+                public void testManyImplMemberNotImplemented() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/manyImplMemberNotImplemented.kt");
+                }
+
+                @Test
+                @TestMetadata("manyInterfacesMemberNotImplemented.kt")
+                public void testManyInterfacesMemberNotImplemented() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/manyInterfacesMemberNotImplemented.kt");
+                }
+
+                @Test
+                @TestMetadata("multipleExpectInterfacesImplementation.kt")
+                public void testMultipleExpectInterfacesImplementation() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/multipleExpectInterfacesImplementation.kt");
+                }
+            }
+
             @Nested
             @TestMetadata("compiler/testData/diagnostics/tests/multiplatform/smartCasts")
             @TestDataPath("$PROJECT_ROOT")

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java

@@ -26,54 +26,6 @@ public class FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated extends Abst
         runTest("compiler/testData/diagnostics/tests/multiplatform/actualClassDelegationWithImplicitType.kt");
     }
 
-    @Test
-    @TestMetadata("actualFakeOverride.kt")
-    public void testActualFakeOverride() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride.kt");
-    }
-
-    @Test
-    @TestMetadata("actualFakeOverrideVirtual.kt")
-    public void testActualFakeOverrideVirtual() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverrideVirtual.kt");
-    }
-
-    @Test
-    @TestMetadata("actualFakeOverride_defaultParamsIncompatibility.kt")
-    public void testActualFakeOverride_defaultParamsIncompatibility() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_defaultParamsIncompatibility.kt");
-    }
-
-    @Test
-    @TestMetadata("actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt")
-    public void testActualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt");
-    }
-
-    @Test
-    @TestMetadata("actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt")
-    public void testActualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt");
-    }
-
-    @Test
-    @TestMetadata("actualFakeOverride_substitutionFakeOverride.kt")
-    public void testActualFakeOverride_substitutionFakeOverride() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_substitutionFakeOverride.kt");
-    }
-
-    @Test
-    @TestMetadata("actualFakeOverride_transitiveFakeOverrides_compatible.kt")
-    public void testActualFakeOverride_transitiveFakeOverrides_compatible() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_transitiveFakeOverrides_compatible.kt");
-    }
-
-    @Test
-    @TestMetadata("actualFakeOverride_transitiveFakeOverrides_incompatible.kt")
-    public void testActualFakeOverride_transitiveFakeOverrides_incompatible() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_transitiveFakeOverrides_incompatible.kt");
-    }
-
     @Test
     @TestMetadata("actualMissingConstructor.kt")
     public void testActualMissingConstructor() throws Exception {
@@ -169,18 +121,6 @@ public class FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated extends Abst
         runTest("compiler/testData/diagnostics/tests/multiplatform/checkNoActualForExpectInLastModule.kt");
     }
 
-    @Test
-    @TestMetadata("defaultParams_inheritanceByDelegation_negative.kt")
-    public void testDefaultParams_inheritanceByDelegation_negative() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/defaultParams_inheritanceByDelegation_negative.kt");
-    }
-
-    @Test
-    @TestMetadata("defaultParams_inheritanceByDelegation_positive.kt")
-    public void testDefaultParams_inheritanceByDelegation_positive() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/defaultParams_inheritanceByDelegation_positive.kt");
-    }
-
     @Test
     @TestMetadata("expectAbstractToString.kt")
     public void testExpectAbstractToString() throws Exception {
@@ -283,18 +223,6 @@ public class FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated extends Abst
         runTest("compiler/testData/diagnostics/tests/multiplatform/implFakeOverride.kt");
     }
 
-    @Test
-    @TestMetadata("implicitActualFakeOverride_AbstractMap.kt")
-    public void testImplicitActualFakeOverride_AbstractMap() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/implicitActualFakeOverride_AbstractMap.kt");
-    }
-
-    @Test
-    @TestMetadata("implicitActualFakeOverride_simple.kt")
-    public void testImplicitActualFakeOverride_simple() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/implicitActualFakeOverride_simple.kt");
-    }
-
     @Test
     @TestMetadata("incDecOperatorsInExpectClass.kt")
     public void testIncDecOperatorsInExpectClass() throws Exception {
@@ -355,30 +283,12 @@ public class FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated extends Abst
         runTest("compiler/testData/diagnostics/tests/multiplatform/kt64166.kt");
     }
 
-    @Test
-    @TestMetadata("manyImplMemberNotImplemented.kt")
-    public void testManyImplMemberNotImplemented() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/manyImplMemberNotImplemented.kt");
-    }
-
-    @Test
-    @TestMetadata("manyInterfacesMemberNotImplemented.kt")
-    public void testManyInterfacesMemberNotImplemented() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/manyInterfacesMemberNotImplemented.kt");
-    }
-
     @Test
     @TestMetadata("modifierApplicability.kt")
     public void testModifierApplicability() throws Exception {
         runTest("compiler/testData/diagnostics/tests/multiplatform/modifierApplicability.kt");
     }
 
-    @Test
-    @TestMetadata("multipleExpectInterfacesImplementation.kt")
-    public void testMultipleExpectInterfacesImplementation() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/multipleExpectInterfacesImplementation.kt");
-    }
-
     @Test
     @TestMetadata("namedArguments.kt")
     public void testNamedArguments() throws Exception {
@@ -2021,6 +1931,106 @@ public class FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated extends Abst
         }
     }
 
+    @Nested
+    @TestMetadata("compiler/testData/diagnostics/tests/multiplatform/scopes")
+    @TestDataPath("$PROJECT_ROOT")
+    public class Scopes {
+        @Test
+        @TestMetadata("actualFakeOverride.kt")
+        public void testActualFakeOverride() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride.kt");
+        }
+
+        @Test
+        @TestMetadata("actualFakeOverrideVirtual.kt")
+        public void testActualFakeOverrideVirtual() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverrideVirtual.kt");
+        }
+
+        @Test
+        @TestMetadata("actualFakeOverride_defaultParamsIncompatibility.kt")
+        public void testActualFakeOverride_defaultParamsIncompatibility() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_defaultParamsIncompatibility.kt");
+        }
+
+        @Test
+        @TestMetadata("actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt")
+        public void testActualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt");
+        }
+
+        @Test
+        @TestMetadata("actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt")
+        public void testActualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt");
+        }
+
+        @Test
+        @TestMetadata("actualFakeOverride_substitutionFakeOverride.kt")
+        public void testActualFakeOverride_substitutionFakeOverride() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_substitutionFakeOverride.kt");
+        }
+
+        @Test
+        @TestMetadata("actualFakeOverride_transitiveFakeOverrides_compatible.kt")
+        public void testActualFakeOverride_transitiveFakeOverrides_compatible() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_transitiveFakeOverrides_compatible.kt");
+        }
+
+        @Test
+        @TestMetadata("actualFakeOverride_transitiveFakeOverrides_incompatible.kt")
+        public void testActualFakeOverride_transitiveFakeOverrides_incompatible() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_transitiveFakeOverrides_incompatible.kt");
+        }
+
+        @Test
+        public void testAllFilesPresentInScopes() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/multiplatform/scopes"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), TargetBackend.JVM_IR, true);
+        }
+
+        @Test
+        @TestMetadata("defaultParams_inheritanceByDelegation_negative.kt")
+        public void testDefaultParams_inheritanceByDelegation_negative() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/defaultParams_inheritanceByDelegation_negative.kt");
+        }
+
+        @Test
+        @TestMetadata("defaultParams_inheritanceByDelegation_positive.kt")
+        public void testDefaultParams_inheritanceByDelegation_positive() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/defaultParams_inheritanceByDelegation_positive.kt");
+        }
+
+        @Test
+        @TestMetadata("implicitActualFakeOverride_AbstractMap.kt")
+        public void testImplicitActualFakeOverride_AbstractMap() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/implicitActualFakeOverride_AbstractMap.kt");
+        }
+
+        @Test
+        @TestMetadata("implicitActualFakeOverride_simple.kt")
+        public void testImplicitActualFakeOverride_simple() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/implicitActualFakeOverride_simple.kt");
+        }
+
+        @Test
+        @TestMetadata("manyImplMemberNotImplemented.kt")
+        public void testManyImplMemberNotImplemented() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/manyImplMemberNotImplemented.kt");
+        }
+
+        @Test
+        @TestMetadata("manyInterfacesMemberNotImplemented.kt")
+        public void testManyInterfacesMemberNotImplemented() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/manyInterfacesMemberNotImplemented.kt");
+        }
+
+        @Test
+        @TestMetadata("multipleExpectInterfacesImplementation.kt")
+        public void testMultipleExpectInterfacesImplementation() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/multipleExpectInterfacesImplementation.kt");
+        }
+    }
+
     @Nested
     @TestMetadata("compiler/testData/diagnostics/tests/multiplatform/smartCasts")
     @TestDataPath("$PROJECT_ROOT")

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java

@@ -26,54 +26,6 @@ public class FirOldFrontendMPPDiagnosticsWithPsiTestGenerated extends AbstractFi
         runTest("compiler/testData/diagnostics/tests/multiplatform/actualClassDelegationWithImplicitType.kt");
     }
 
-    @Test
-    @TestMetadata("actualFakeOverride.kt")
-    public void testActualFakeOverride() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride.kt");
-    }
-
-    @Test
-    @TestMetadata("actualFakeOverrideVirtual.kt")
-    public void testActualFakeOverrideVirtual() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverrideVirtual.kt");
-    }
-
-    @Test
-    @TestMetadata("actualFakeOverride_defaultParamsIncompatibility.kt")
-    public void testActualFakeOverride_defaultParamsIncompatibility() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_defaultParamsIncompatibility.kt");
-    }
-
-    @Test
-    @TestMetadata("actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt")
-    public void testActualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt");
-    }
-
-    @Test
-    @TestMetadata("actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt")
-    public void testActualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt");
-    }
-
-    @Test
-    @TestMetadata("actualFakeOverride_substitutionFakeOverride.kt")
-    public void testActualFakeOverride_substitutionFakeOverride() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_substitutionFakeOverride.kt");
-    }
-
-    @Test
-    @TestMetadata("actualFakeOverride_transitiveFakeOverrides_compatible.kt")
-    public void testActualFakeOverride_transitiveFakeOverrides_compatible() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_transitiveFakeOverrides_compatible.kt");
-    }
-
-    @Test
-    @TestMetadata("actualFakeOverride_transitiveFakeOverrides_incompatible.kt")
-    public void testActualFakeOverride_transitiveFakeOverrides_incompatible() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_transitiveFakeOverrides_incompatible.kt");
-    }
-
     @Test
     @TestMetadata("actualMissingConstructor.kt")
     public void testActualMissingConstructor() throws Exception {
@@ -169,18 +121,6 @@ public class FirOldFrontendMPPDiagnosticsWithPsiTestGenerated extends AbstractFi
         runTest("compiler/testData/diagnostics/tests/multiplatform/checkNoActualForExpectInLastModule.kt");
     }
 
-    @Test
-    @TestMetadata("defaultParams_inheritanceByDelegation_negative.kt")
-    public void testDefaultParams_inheritanceByDelegation_negative() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/defaultParams_inheritanceByDelegation_negative.kt");
-    }
-
-    @Test
-    @TestMetadata("defaultParams_inheritanceByDelegation_positive.kt")
-    public void testDefaultParams_inheritanceByDelegation_positive() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/defaultParams_inheritanceByDelegation_positive.kt");
-    }
-
     @Test
     @TestMetadata("expectAbstractToString.kt")
     public void testExpectAbstractToString() throws Exception {
@@ -283,18 +223,6 @@ public class FirOldFrontendMPPDiagnosticsWithPsiTestGenerated extends AbstractFi
         runTest("compiler/testData/diagnostics/tests/multiplatform/implFakeOverride.kt");
     }
 
-    @Test
-    @TestMetadata("implicitActualFakeOverride_AbstractMap.kt")
-    public void testImplicitActualFakeOverride_AbstractMap() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/implicitActualFakeOverride_AbstractMap.kt");
-    }
-
-    @Test
-    @TestMetadata("implicitActualFakeOverride_simple.kt")
-    public void testImplicitActualFakeOverride_simple() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/implicitActualFakeOverride_simple.kt");
-    }
-
     @Test
     @TestMetadata("incDecOperatorsInExpectClass.kt")
     public void testIncDecOperatorsInExpectClass() throws Exception {
@@ -355,30 +283,12 @@ public class FirOldFrontendMPPDiagnosticsWithPsiTestGenerated extends AbstractFi
         runTest("compiler/testData/diagnostics/tests/multiplatform/kt64166.kt");
     }
 
-    @Test
-    @TestMetadata("manyImplMemberNotImplemented.kt")
-    public void testManyImplMemberNotImplemented() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/manyImplMemberNotImplemented.kt");
-    }
-
-    @Test
-    @TestMetadata("manyInterfacesMemberNotImplemented.kt")
-    public void testManyInterfacesMemberNotImplemented() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/manyInterfacesMemberNotImplemented.kt");
-    }
-
     @Test
     @TestMetadata("modifierApplicability.kt")
     public void testModifierApplicability() throws Exception {
         runTest("compiler/testData/diagnostics/tests/multiplatform/modifierApplicability.kt");
     }
 
-    @Test
-    @TestMetadata("multipleExpectInterfacesImplementation.kt")
-    public void testMultipleExpectInterfacesImplementation() throws Exception {
-        runTest("compiler/testData/diagnostics/tests/multiplatform/multipleExpectInterfacesImplementation.kt");
-    }
-
     @Test
     @TestMetadata("namedArguments.kt")
     public void testNamedArguments() throws Exception {
@@ -2021,6 +1931,106 @@ public class FirOldFrontendMPPDiagnosticsWithPsiTestGenerated extends AbstractFi
         }
     }
 
+    @Nested
+    @TestMetadata("compiler/testData/diagnostics/tests/multiplatform/scopes")
+    @TestDataPath("$PROJECT_ROOT")
+    public class Scopes {
+        @Test
+        @TestMetadata("actualFakeOverride.kt")
+        public void testActualFakeOverride() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride.kt");
+        }
+
+        @Test
+        @TestMetadata("actualFakeOverrideVirtual.kt")
+        public void testActualFakeOverrideVirtual() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverrideVirtual.kt");
+        }
+
+        @Test
+        @TestMetadata("actualFakeOverride_defaultParamsIncompatibility.kt")
+        public void testActualFakeOverride_defaultParamsIncompatibility() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_defaultParamsIncompatibility.kt");
+        }
+
+        @Test
+        @TestMetadata("actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt")
+        public void testActualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt");
+        }
+
+        @Test
+        @TestMetadata("actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt")
+        public void testActualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt");
+        }
+
+        @Test
+        @TestMetadata("actualFakeOverride_substitutionFakeOverride.kt")
+        public void testActualFakeOverride_substitutionFakeOverride() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_substitutionFakeOverride.kt");
+        }
+
+        @Test
+        @TestMetadata("actualFakeOverride_transitiveFakeOverrides_compatible.kt")
+        public void testActualFakeOverride_transitiveFakeOverrides_compatible() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_transitiveFakeOverrides_compatible.kt");
+        }
+
+        @Test
+        @TestMetadata("actualFakeOverride_transitiveFakeOverrides_incompatible.kt")
+        public void testActualFakeOverride_transitiveFakeOverrides_incompatible() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_transitiveFakeOverrides_incompatible.kt");
+        }
+
+        @Test
+        public void testAllFilesPresentInScopes() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/multiplatform/scopes"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), TargetBackend.JVM_IR, true);
+        }
+
+        @Test
+        @TestMetadata("defaultParams_inheritanceByDelegation_negative.kt")
+        public void testDefaultParams_inheritanceByDelegation_negative() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/defaultParams_inheritanceByDelegation_negative.kt");
+        }
+
+        @Test
+        @TestMetadata("defaultParams_inheritanceByDelegation_positive.kt")
+        public void testDefaultParams_inheritanceByDelegation_positive() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/defaultParams_inheritanceByDelegation_positive.kt");
+        }
+
+        @Test
+        @TestMetadata("implicitActualFakeOverride_AbstractMap.kt")
+        public void testImplicitActualFakeOverride_AbstractMap() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/implicitActualFakeOverride_AbstractMap.kt");
+        }
+
+        @Test
+        @TestMetadata("implicitActualFakeOverride_simple.kt")
+        public void testImplicitActualFakeOverride_simple() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/implicitActualFakeOverride_simple.kt");
+        }
+
+        @Test
+        @TestMetadata("manyImplMemberNotImplemented.kt")
+        public void testManyImplMemberNotImplemented() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/manyImplMemberNotImplemented.kt");
+        }
+
+        @Test
+        @TestMetadata("manyInterfacesMemberNotImplemented.kt")
+        public void testManyInterfacesMemberNotImplemented() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/manyInterfacesMemberNotImplemented.kt");
+        }
+
+        @Test
+        @TestMetadata("multipleExpectInterfacesImplementation.kt")
+        public void testMultipleExpectInterfacesImplementation() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/multipleExpectInterfacesImplementation.kt");
+        }
+    }
+
     @Nested
     @TestMetadata("compiler/testData/diagnostics/tests/multiplatform/smartCasts")
     @TestDataPath("$PROJECT_ROOT")

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java

@@ -24677,54 +24677,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 runTest("compiler/testData/diagnostics/tests/multiplatform/actualClassDelegationWithImplicitType.kt");
             }
 
-            @Test
-            @TestMetadata("actualFakeOverride.kt")
-            public void testActualFakeOverride() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverrideVirtual.kt")
-            public void testActualFakeOverrideVirtual() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverrideVirtual.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverride_defaultParamsIncompatibility.kt")
-            public void testActualFakeOverride_defaultParamsIncompatibility() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_defaultParamsIncompatibility.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt")
-            public void testActualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt")
-            public void testActualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverride_substitutionFakeOverride.kt")
-            public void testActualFakeOverride_substitutionFakeOverride() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_substitutionFakeOverride.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverride_transitiveFakeOverrides_compatible.kt")
-            public void testActualFakeOverride_transitiveFakeOverrides_compatible() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_transitiveFakeOverrides_compatible.kt");
-            }
-
-            @Test
-            @TestMetadata("actualFakeOverride_transitiveFakeOverrides_incompatible.kt")
-            public void testActualFakeOverride_transitiveFakeOverrides_incompatible() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_transitiveFakeOverrides_incompatible.kt");
-            }
-
             @Test
             @TestMetadata("actualMissingConstructor.kt")
             public void testActualMissingConstructor() throws Exception {
@@ -24820,18 +24772,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 runTest("compiler/testData/diagnostics/tests/multiplatform/checkNoActualForExpectInLastModule.kt");
             }
 
-            @Test
-            @TestMetadata("defaultParams_inheritanceByDelegation_negative.kt")
-            public void testDefaultParams_inheritanceByDelegation_negative() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/defaultParams_inheritanceByDelegation_negative.kt");
-            }
-
-            @Test
-            @TestMetadata("defaultParams_inheritanceByDelegation_positive.kt")
-            public void testDefaultParams_inheritanceByDelegation_positive() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/defaultParams_inheritanceByDelegation_positive.kt");
-            }
-
             @Test
             @TestMetadata("expectAbstractToString.kt")
             public void testExpectAbstractToString() throws Exception {
@@ -24934,18 +24874,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 runTest("compiler/testData/diagnostics/tests/multiplatform/implFakeOverride.kt");
             }
 
-            @Test
-            @TestMetadata("implicitActualFakeOverride_AbstractMap.kt")
-            public void testImplicitActualFakeOverride_AbstractMap() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/implicitActualFakeOverride_AbstractMap.kt");
-            }
-
-            @Test
-            @TestMetadata("implicitActualFakeOverride_simple.kt")
-            public void testImplicitActualFakeOverride_simple() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/implicitActualFakeOverride_simple.kt");
-            }
-
             @Test
             @TestMetadata("incDecOperatorsInExpectClass.kt")
             public void testIncDecOperatorsInExpectClass() throws Exception {
@@ -25006,30 +24934,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 runTest("compiler/testData/diagnostics/tests/multiplatform/kt64166.kt");
             }
 
-            @Test
-            @TestMetadata("manyImplMemberNotImplemented.kt")
-            public void testManyImplMemberNotImplemented() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/manyImplMemberNotImplemented.kt");
-            }
-
-            @Test
-            @TestMetadata("manyInterfacesMemberNotImplemented.kt")
-            public void testManyInterfacesMemberNotImplemented() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/manyInterfacesMemberNotImplemented.kt");
-            }
-
             @Test
             @TestMetadata("modifierApplicability.kt")
             public void testModifierApplicability() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/multiplatform/modifierApplicability.kt");
             }
 
-            @Test
-            @TestMetadata("multipleExpectInterfacesImplementation.kt")
-            public void testMultipleExpectInterfacesImplementation() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/multiplatform/multipleExpectInterfacesImplementation.kt");
-            }
-
             @Test
             @TestMetadata("namedArguments.kt")
             public void testNamedArguments() throws Exception {
@@ -26672,6 +26582,106 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 }
             }
 
+            @Nested
+            @TestMetadata("compiler/testData/diagnostics/tests/multiplatform/scopes")
+            @TestDataPath("$PROJECT_ROOT")
+            public class Scopes {
+                @Test
+                @TestMetadata("actualFakeOverride.kt")
+                public void testActualFakeOverride() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverrideVirtual.kt")
+                public void testActualFakeOverrideVirtual() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverrideVirtual.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverride_defaultParamsIncompatibility.kt")
+                public void testActualFakeOverride_defaultParamsIncompatibility() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_defaultParamsIncompatibility.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt")
+                public void testActualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt")
+                public void testActualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_paramsAreCompatibleViaTransitiveSharedMethodWithDefaultParams.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverride_substitutionFakeOverride.kt")
+                public void testActualFakeOverride_substitutionFakeOverride() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_substitutionFakeOverride.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverride_transitiveFakeOverrides_compatible.kt")
+                public void testActualFakeOverride_transitiveFakeOverrides_compatible() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_transitiveFakeOverrides_compatible.kt");
+                }
+
+                @Test
+                @TestMetadata("actualFakeOverride_transitiveFakeOverrides_incompatible.kt")
+                public void testActualFakeOverride_transitiveFakeOverrides_incompatible() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/actualFakeOverride_transitiveFakeOverrides_incompatible.kt");
+                }
+
+                @Test
+                public void testAllFilesPresentInScopes() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/multiplatform/scopes"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
+                }
+
+                @Test
+                @TestMetadata("defaultParams_inheritanceByDelegation_negative.kt")
+                public void testDefaultParams_inheritanceByDelegation_negative() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/defaultParams_inheritanceByDelegation_negative.kt");
+                }
+
+                @Test
+                @TestMetadata("defaultParams_inheritanceByDelegation_positive.kt")
+                public void testDefaultParams_inheritanceByDelegation_positive() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/defaultParams_inheritanceByDelegation_positive.kt");
+                }
+
+                @Test
+                @TestMetadata("implicitActualFakeOverride_AbstractMap.kt")
+                public void testImplicitActualFakeOverride_AbstractMap() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/implicitActualFakeOverride_AbstractMap.kt");
+                }
+
+                @Test
+                @TestMetadata("implicitActualFakeOverride_simple.kt")
+                public void testImplicitActualFakeOverride_simple() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/implicitActualFakeOverride_simple.kt");
+                }
+
+                @Test
+                @TestMetadata("manyImplMemberNotImplemented.kt")
+                public void testManyImplMemberNotImplemented() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/manyImplMemberNotImplemented.kt");
+                }
+
+                @Test
+                @TestMetadata("manyInterfacesMemberNotImplemented.kt")
+                public void testManyInterfacesMemberNotImplemented() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/manyInterfacesMemberNotImplemented.kt");
+                }
+
+                @Test
+                @TestMetadata("multipleExpectInterfacesImplementation.kt")
+                public void testMultipleExpectInterfacesImplementation() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/scopes/multipleExpectInterfacesImplementation.kt");
+                }
+            }
+
             @Nested
             @TestMetadata("compiler/testData/diagnostics/tests/multiplatform/smartCasts")
             @TestDataPath("$PROJECT_ROOT")