diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisScriptSourceModuleMemberScopeByFqNameTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisScriptSourceModuleMemberScopeTestGenerated.java similarity index 82% rename from analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisScriptSourceModuleMemberScopeByFqNameTestGenerated.java rename to analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisScriptSourceModuleMemberScopeTestGenerated.java index 7a97c169ce1..9c5255a7d1f 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisScriptSourceModuleMemberScopeByFqNameTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisScriptSourceModuleMemberScopeTestGenerated.java @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModul import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendKind; import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisSessionMode; import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiMode; -import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractMemberScopeByFqNameTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractMemberScopeTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -25,9 +25,9 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName") +@TestMetadata("analysis/analysis-api/testData/components/scopeProvider/memberScope") @TestDataPath("$PROJECT_ROOT") -public class FirIdeNormalAnalysisScriptSourceModuleMemberScopeByFqNameTestGenerated extends AbstractMemberScopeByFqNameTest { +public class FirIdeNormalAnalysisScriptSourceModuleMemberScopeTestGenerated extends AbstractMemberScopeTest { @NotNull @Override public AnalysisApiTestConfigurator getConfigurator() { @@ -42,17 +42,17 @@ public class FirIdeNormalAnalysisScriptSourceModuleMemberScopeByFqNameTestGenera } @Test - public void testAllFilesPresentInMemberScopeByFqName() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName"), Pattern.compile("^(.+)\\.kts$"), null, true); + public void testAllFilesPresentInMemberScope() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/memberScope"), Pattern.compile("^(.+)\\.kts$"), null, true); } @Nested - @TestMetadata("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled") + @TestMetadata("analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled") @TestDataPath("$PROJECT_ROOT") public class WithTestCompilerPluginEnabled { @Test public void testAllFilesPresentInWithTestCompilerPluginEnabled() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled"), Pattern.compile("^(.+)\\.kts$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled"), Pattern.compile("^(.+)\\.kts$"), null, true); } } } diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleMemberScopeTestGenerated.java similarity index 78% rename from analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java rename to analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleMemberScopeTestGenerated.java index 232bc966efe..74b811c6a69 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleMemberScopeTestGenerated.java @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModul import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendKind; import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisSessionMode; import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiMode; -import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractMemberScopeByFqNameTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractMemberScopeTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -25,9 +25,9 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName") +@TestMetadata("analysis/analysis-api/testData/components/scopeProvider/memberScope") @TestDataPath("$PROJECT_ROOT") -public class FirIdeNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated extends AbstractMemberScopeByFqNameTest { +public class FirIdeNormalAnalysisSourceModuleMemberScopeTestGenerated extends AbstractMemberScopeTest { @NotNull @Override public AnalysisApiTestConfigurator getConfigurator() { @@ -42,137 +42,137 @@ public class FirIdeNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated ex } @Test - public void testAllFilesPresentInMemberScopeByFqName() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInMemberScope() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/memberScope"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("class.kt") public void testClass() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/class.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/class.kt"); } @Test @TestMetadata("dataClass.kt") public void testDataClass() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/dataClass.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/dataClass.kt"); } @Test @TestMetadata("enumClass.kt") public void testEnumClass() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClass.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.kt"); } @Test @TestMetadata("enumClassWithAbstractMembers.kt") public void testEnumClassWithAbstractMembers() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClassWithAbstractMembers.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.kt"); } @Test @TestMetadata("enumClassWithFinalMembers.kt") public void testEnumClassWithFinalMembers() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClassWithFinalMembers.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.kt"); } @Test @TestMetadata("enumEntryInitializer.kt") public void testEnumEntryInitializer() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializer.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.kt"); } @Test @TestMetadata("enumEntryInitializerWithFinalEnumMember.kt") public void testEnumEntryInitializerWithFinalEnumMember() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithFinalEnumMember.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.kt"); } @Test @TestMetadata("enumEntryInitializerWithOverriddenMember.kt") public void testEnumEntryInitializerWithOverriddenMember() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithOverriddenMember.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.kt"); } @Test @TestMetadata("Int.kt") public void testInt() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/Int.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/Int.kt"); } @Test @TestMetadata("javaClass.kt") public void testJavaClass() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaClass.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.kt"); } @Test @TestMetadata("javaField.kt") public void testJavaField() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaField.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/javaField.kt"); } @Test @TestMetadata("javaFieldClash.kt") public void testJavaFieldClash() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaFieldClash.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/javaFieldClash.kt"); } @Test @TestMetadata("javaMethods.kt") public void testJavaMethods() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaMethods.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/javaMethods.kt"); } @Test @TestMetadata("java.lang.String.kt") public void testJava_lang_String() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/java.lang.String.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/java.lang.String.kt"); } @Test @TestMetadata("kotlin.Function2.kt") public void testKotlin_Function2() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/kotlin.Function2.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/kotlin.Function2.kt"); } @Test @TestMetadata("MutableList.kt") public void testMutableList() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/MutableList.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.kt"); } @Test @TestMetadata("substitutionOverride.kt") public void testSubstitutionOverride() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/substitutionOverride.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/substitutionOverride.kt"); } @Nested - @TestMetadata("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled") + @TestMetadata("analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled") @TestDataPath("$PROJECT_ROOT") public class WithTestCompilerPluginEnabled { @Test public void testAllFilesPresentInWithTestCompilerPluginEnabled() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("customSerlializable.kt") public void testCustomSerlializable() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/customSerlializable.kt"); } @Test @TestMetadata("generatedCompanionWithFoo.kt") public void testGeneratedCompanionWithFoo() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/generatedCompanionWithFoo.kt"); } @Test @TestMetadata("nestedClassAndMaterializeMember.kt") public void testNestedClassAndMaterializeMember() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.kt"); } } } diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractMemberScopeTests.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractMemberScopeTests.kt index 93062256076..00e9cf90d53 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractMemberScopeTests.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractMemberScopeTests.kt @@ -27,7 +27,7 @@ abstract class AbstractMemberScopeTestBase : AbstractSymbolByFqNameTest() { } } -abstract class AbstractMemberScopeByFqNameTest : AbstractMemberScopeTestBase() { +abstract class AbstractMemberScopeTest : AbstractMemberScopeTestBase() { context(KtAnalysisSession) override fun KtSymbolWithMembers.getSymbolsFromScope(): Sequence = getMemberScope().getAllSymbols() } diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleMemberScopeTestGenerated.java similarity index 80% rename from analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java rename to analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleMemberScopeTestGenerated.java index 3d836870ceb..65e11208f78 100644 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleMemberScopeTestGenerated.java @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModul import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendKind; import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisSessionMode; import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiMode; -import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractMemberScopeByFqNameTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractMemberScopeTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -25,9 +25,9 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName") +@TestMetadata("analysis/analysis-api/testData/components/scopeProvider/memberScope") @TestDataPath("$PROJECT_ROOT") -public class FirStandaloneNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated extends AbstractMemberScopeByFqNameTest { +public class FirStandaloneNormalAnalysisSourceModuleMemberScopeTestGenerated extends AbstractMemberScopeTest { @NotNull @Override public AnalysisApiTestConfigurator getConfigurator() { @@ -42,109 +42,109 @@ public class FirStandaloneNormalAnalysisSourceModuleMemberScopeByFqNameTestGener } @Test - public void testAllFilesPresentInMemberScopeByFqName() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName"), Pattern.compile("^(.+)\\.kt$"), null, true, "withTestCompilerPluginEnabled"); + public void testAllFilesPresentInMemberScope() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/memberScope"), Pattern.compile("^(.+)\\.kt$"), null, true, "withTestCompilerPluginEnabled"); } @Test @TestMetadata("class.kt") public void testClass() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/class.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/class.kt"); } @Test @TestMetadata("dataClass.kt") public void testDataClass() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/dataClass.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/dataClass.kt"); } @Test @TestMetadata("enumClass.kt") public void testEnumClass() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClass.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.kt"); } @Test @TestMetadata("enumClassWithAbstractMembers.kt") public void testEnumClassWithAbstractMembers() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClassWithAbstractMembers.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.kt"); } @Test @TestMetadata("enumClassWithFinalMembers.kt") public void testEnumClassWithFinalMembers() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClassWithFinalMembers.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.kt"); } @Test @TestMetadata("enumEntryInitializer.kt") public void testEnumEntryInitializer() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializer.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.kt"); } @Test @TestMetadata("enumEntryInitializerWithFinalEnumMember.kt") public void testEnumEntryInitializerWithFinalEnumMember() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithFinalEnumMember.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.kt"); } @Test @TestMetadata("enumEntryInitializerWithOverriddenMember.kt") public void testEnumEntryInitializerWithOverriddenMember() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithOverriddenMember.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.kt"); } @Test @TestMetadata("Int.kt") public void testInt() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/Int.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/Int.kt"); } @Test @TestMetadata("javaClass.kt") public void testJavaClass() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaClass.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.kt"); } @Test @TestMetadata("javaField.kt") public void testJavaField() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaField.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/javaField.kt"); } @Test @TestMetadata("javaFieldClash.kt") public void testJavaFieldClash() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaFieldClash.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/javaFieldClash.kt"); } @Test @TestMetadata("javaMethods.kt") public void testJavaMethods() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaMethods.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/javaMethods.kt"); } @Test @TestMetadata("java.lang.String.kt") public void testJava_lang_String() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/java.lang.String.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/java.lang.String.kt"); } @Test @TestMetadata("kotlin.Function2.kt") public void testKotlin_Function2() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/kotlin.Function2.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/kotlin.Function2.kt"); } @Test @TestMetadata("MutableList.kt") public void testMutableList() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/MutableList.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.kt"); } @Test @TestMetadata("substitutionOverride.kt") public void testSubstitutionOverride() throws Exception { - runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/substitutionOverride.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScope/substitutionOverride.kt"); } } diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/Int.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/Int.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/Int.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/Int.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/Int.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/Int.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/Int.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/Int.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/Int.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/Int.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/Int.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/Int.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/MutableList.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/MutableList.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/MutableList.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/MutableList.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/MutableList.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/MutableList.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/class.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/class.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/class.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/class.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/class.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/class.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/class.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/class.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/class.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/class.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/class.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/class.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/dataClass.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/dataClass.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/dataClass.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/dataClass.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/dataClass.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/dataClass.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/dataClass.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/dataClass.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/dataClass.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/dataClass.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/dataClass.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/dataClass.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClass.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClass.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClass.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClass.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClass.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClass.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClassWithAbstractMembers.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClassWithAbstractMembers.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClassWithAbstractMembers.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClassWithAbstractMembers.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClassWithAbstractMembers.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClassWithAbstractMembers.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClassWithFinalMembers.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClassWithFinalMembers.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClassWithFinalMembers.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClassWithFinalMembers.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClassWithFinalMembers.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumClassWithFinalMembers.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializer.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializer.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializer.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializer.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializer.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializer.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithFinalEnumMember.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithFinalEnumMember.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithFinalEnumMember.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithFinalEnumMember.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithFinalEnumMember.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithFinalEnumMember.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithOverriddenMember.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithOverriddenMember.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithOverriddenMember.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithOverriddenMember.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithOverriddenMember.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithOverriddenMember.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/java.lang.String.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/java.lang.String.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/java.lang.String.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/java.lang.String.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/java.lang.String.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/java.lang.String.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/java.lang.String.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/java.lang.String.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/java.lang.String.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/java.lang.String.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/java.lang.String.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/java.lang.String.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaClass.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaClass.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaClass.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaClass.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaClass.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaClass.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaField.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaField.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaField.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/javaField.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaField.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaField.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaField.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/javaField.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaField.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaField.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaField.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/javaField.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaFieldClash.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaFieldClash.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaFieldClash.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/javaFieldClash.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaFieldClash.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaFieldClash.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaFieldClash.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/javaFieldClash.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaFieldClash.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaFieldClash.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaFieldClash.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/javaFieldClash.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaMethods.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaMethods.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaMethods.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/javaMethods.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaMethods.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaMethods.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaMethods.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/javaMethods.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaMethods.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaMethods.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaMethods.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/javaMethods.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/kotlin.Function2.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/kotlin.Function2.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/kotlin.Function2.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/kotlin.Function2.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/kotlin.Function2.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/kotlin.Function2.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/kotlin.Function2.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/kotlin.Function2.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/kotlin.Function2.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/kotlin.Function2.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/kotlin.Function2.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/kotlin.Function2.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/overridenFunctionWithGenericBound.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/overridenFunctionWithGenericBound.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/overridenFunctionWithGenericBound.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/overridenFunctionWithGenericBound.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/overridenFunctionWithGenericBound.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/overridenFunctionWithGenericBound.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/overridenFunctionWithGenericBound.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/overridenFunctionWithGenericBound.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/substitutionOverride.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/substitutionOverride.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/substitutionOverride.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/substitutionOverride.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/substitutionOverride.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/substitutionOverride.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/substitutionOverride.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/substitutionOverride.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/substitutionOverride.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/substitutionOverride.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/substitutionOverride.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/substitutionOverride.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/customSerlializable.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/customSerlializable.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/customSerlializable.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/customSerlializable.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/customSerlializable.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/customSerlializable.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/generatedCompanionWithFoo.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/generatedCompanionWithFoo.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/generatedCompanionWithFoo.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/generatedCompanionWithFoo.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/generatedCompanionWithFoo.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/generatedCompanionWithFoo.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.kt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.pretty.txt diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.txt similarity index 100% rename from analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScope/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.txt diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt index ba2a2a11d02..3a6f83c3644 100644 --- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt +++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt @@ -476,14 +476,14 @@ private fun AnalysisApiTestGroup.generateAnalysisApiComponentsTests() { } test( - AbstractMemberScopeByFqNameTest::class, + AbstractMemberScopeTest::class, filter = frontendIs(FrontendKind.Fir), ) { when (it.analysisApiMode) { AnalysisApiMode.Ide -> - model(it, "memberScopeByFqName") + model(it, "memberScope") AnalysisApiMode.Standalone -> - model(it, "memberScopeByFqName", excludeDirsRecursively = listOf("withTestCompilerPluginEnabled")) + model(it, "memberScope", excludeDirsRecursively = listOf("withTestCompilerPluginEnabled")) } }