From e8272fa02ee3e93acc04ab2a8269f03ad12a8ba3 Mon Sep 17 00:00:00 2001 From: aleksandrina-streltsova Date: Sun, 12 Mar 2023 13:10:14 +0200 Subject: [PATCH] [Analysis API] Move testdata for scope provider --- ...oduleDelegateMemberScopeTestGenerated.java | 14 ++-- ...sisSourceModuleFileScopeTestGenerated.java | 12 +-- ...eScopeContextForPositionTestGenerated.java | 4 +- ...sisSourceModuleTypeScopeTestGenerated.java | 4 +- ...oduleDeclaredMemberScopeTestGenerated.java | 14 ++-- ...oduleDelegateMemberScopeTestGenerated.java | 14 ++-- ...sisSourceModuleFileScopeTestGenerated.java | 12 +-- ...oduleMemberScopeByFqNameTestGenerated.java | 38 +++++----- ...eScopeContextForPositionTestGenerated.java | 4 +- ...utionOverridesUnwrappingTestGenerated.java | 36 ++++----- ...sisSourceModuleTypeScopeTestGenerated.java | 4 +- .../AbstractDeclaredMemberScopeTest.kt | 2 +- .../AbstractDelegateMemberScopeTest.kt | 4 +- .../scopeProvider}/AbstractFileScopeTest.kt | 4 +- .../AbstractMemberScopeByFqNameTest.kt | 4 +- .../AbstractScopeContextForPositionTest.kt | 2 +- ...ractSubstitutionOverridesUnwrappingTest.kt | 4 +- .../scopeProvider}/AbstractTypeScopeTest.kt | 9 +-- ...oduleDeclaredMemberScopeTestGenerated.java | 14 ++-- ...oduleDelegateMemberScopeTestGenerated.java | 14 ++-- ...sisSourceModuleFileScopeTestGenerated.java | 12 +-- ...oduleMemberScopeByFqNameTestGenerated.java | 28 +++---- ...eScopeContextForPositionTestGenerated.java | 4 +- ...utionOverridesUnwrappingTestGenerated.java | 36 ++++----- ...sisSourceModuleTypeScopeTestGenerated.java | 4 +- .../javaDeclaredEnhancementScope.kt | 0 .../javaDeclaredEnhancementScope.pretty.txt | 0 .../javaDeclaredEnhancementScope.txt | 0 .../javaDeclaredInheritList.kt | 0 .../javaDeclaredInheritList.pretty.txt | 0 .../javaDeclaredInheritList.txt | 0 .../javaInnerClassConstructor.kt | 0 .../javaInnerClassConstructor.pretty.txt | 0 .../javaInnerClassConstructor.txt | 0 .../propertyWithGetter.descriptors.pretty.txt | 0 .../propertyWithGetter.descriptors.txt | 0 .../propertyWithGetter.kt | 0 .../propertyWithGetter.pretty.txt | 0 .../propertyWithGetter.txt | 0 .../simple.descriptors.pretty.txt | 0 .../simple.descriptors.txt | 0 .../delegatedMemberScope/simple.kt | 0 .../delegatedMemberScope/simple.pretty.txt | 0 .../delegatedMemberScope/simple.txt | 0 .../withOverridden.descriptors.pretty.txt | 0 .../withOverridden.descriptors.txt | 0 .../delegatedMemberScope/withOverridden.kt | 0 .../withOverridden.pretty.txt | 0 .../delegatedMemberScope/withOverridden.txt | 2 +- .../fileScopeTest/fileScope.descriptors.txt | 0 .../scopeProvider}/fileScopeTest/fileScope.kt | 0 .../fileScopeTest/fileScope.txt | 0 .../fileScopeTest/simpleFileScope.kt | 0 .../fileScopeTest/simpleFileScope.txt | 0 .../scopeProvider}/memberScopeByFqName/Int.kt | 0 .../memberScopeByFqName/Int.pretty.txt | 0 .../memberScopeByFqName/Int.txt | 0 .../memberScopeByFqName/MutableList.kt | 0 .../MutableList.pretty.txt | 0 .../memberScopeByFqName/MutableList.txt | 0 .../memberScopeByFqName/dataClass.kt | 0 .../memberScopeByFqName/dataClass.pretty.txt | 0 .../memberScopeByFqName/dataClass.txt | 0 .../emumEntryWithoutMembers.kt | 0 .../emumEntryWithoutMembers.pretty.txt | 0 .../emumEntryWithoutMembers.txt | 0 .../memberScopeByFqName/enumEntry.kt | 0 .../memberScopeByFqName/enumEntry.pretty.txt | 0 .../memberScopeByFqName/enumEntry.txt | 0 .../memberScopeByFqName/java.lang.String.kt | 0 .../java.lang.String.pretty.txt | 0 .../memberScopeByFqName/java.lang.String.txt | 0 .../memberScopeByFqName/javaField.kt | 0 .../memberScopeByFqName/javaField.pretty.txt | 0 .../memberScopeByFqName/javaField.txt | 0 .../memberScopeByFqName/javaFieldClash.kt | 0 .../javaFieldClash.pretty.txt | 0 .../memberScopeByFqName/javaFieldClash.txt | 0 .../memberScopeByFqName/javaMethods.kt | 0 .../javaMethods.pretty.txt | 0 .../memberScopeByFqName/javaMethods.txt | 0 .../memberScopeByFqName/kotlin.Function2.kt | 0 .../kotlin.Function2.pretty.txt | 0 .../memberScopeByFqName/kotlin.Function2.txt | 0 ...erridenFunctionWithGenericBound.pretty.txt | 0 .../overridenFunctionWithGenericBound.txt | 0 .../customSerlializable.kt | 0 .../customSerlializable.pretty.txt | 0 .../customSerlializable.txt | 0 .../generatedCompanionWithFoo.kt | 0 .../generatedCompanionWithFoo.pretty.txt | 0 .../generatedCompanionWithFoo.txt | 0 .../nestedClassAndMaterializeMember.kt | 0 ...nestedClassAndMaterializeMember.pretty.txt | 0 .../nestedClassAndMaterializeMember.txt | 0 ...assWithGenericBase1.descriptors.pretty.txt | 0 .../ClassWithGenericBase1.descriptors.txt | 0 .../ClassWithGenericBase1.kt | 0 .../ClassWithGenericBase1.pretty.txt | 0 .../ClassWithGenericBase1.txt | 0 ...assWithGenericBase2.descriptors.pretty.txt | 0 .../ClassWithGenericBase2.descriptors.txt | 0 .../ClassWithGenericBase2.kt | 0 .../ClassWithGenericBase2.pretty.txt | 0 .../ClassWithGenericBase2.txt | 0 ...assWithGenericBase3.descriptors.pretty.txt | 0 .../ClassWithGenericBase3.descriptors.txt | 0 .../ClassWithGenericBase3.kt | 0 .../ClassWithGenericBase3.pretty.txt | 0 .../ClassWithGenericBase3.txt | 0 ...assWithGenericBase4.descriptors.pretty.txt | 0 .../ClassWithGenericBase4.descriptors.txt | 0 .../ClassWithGenericBase4.kt | 0 .../ClassWithGenericBase4.pretty.txt | 0 .../ClassWithGenericBase4.txt | 0 ...nctionInLocalClass1.descriptors.pretty.txt | 0 ...cFromFunctionInLocalClass1.descriptors.txt | 0 .../GenericFromFunctionInLocalClass1.kt | 0 ...enericFromFunctionInLocalClass1.pretty.txt | 0 .../GenericFromFunctionInLocalClass1.txt | 0 ...nctionInLocalClass2.descriptors.pretty.txt | 0 ...cFromFunctionInLocalClass2.descriptors.txt | 0 .../GenericFromFunctionInLocalClass2.kt | 0 ...enericFromFunctionInLocalClass2.pretty.txt | 0 .../GenericFromFunctionInLocalClass2.txt | 0 ...rClassInInnerClass1.descriptors.pretty.txt | 0 ...romOuterClassInInnerClass1.descriptors.txt | 0 .../GenericFromOuterClassInInnerClass1.kt | 0 ...ericFromOuterClassInInnerClass1.pretty.txt | 0 .../GenericFromOuterClassInInnerClass1.txt | 0 ...rClassInInnerClass2.descriptors.pretty.txt | 0 ...romOuterClassInInnerClass2.descriptors.txt | 0 .../GenericFromOuterClassInInnerClass2.kt | 0 ...ericFromOuterClassInInnerClass2.pretty.txt | 0 .../GenericFromOuterClassInInnerClass2.txt | 0 ...erClassInInheritor1.descriptors.pretty.txt | 0 ...ssInInnerClassInInheritor1.descriptors.txt | 0 ...cFromOuterClassInInnerClassInInheritor1.kt | 0 ...erClassInInnerClassInInheritor1.pretty.txt | 0 ...FromOuterClassInInnerClassInInheritor1.txt | 0 ...erClassInInheritor2.descriptors.pretty.txt | 0 ...ssInInnerClassInInheritor2.descriptors.txt | 0 ...cFromOuterClassInInnerClassInInheritor2.kt | 0 ...erClassInInnerClassInInheritor2.pretty.txt | 0 ...FromOuterClassInInnerClassInInheritor2.txt | 0 ...erClassInInheritor3.descriptors.pretty.txt | 0 ...ssInInnerClassInInheritor3.descriptors.txt | 0 ...cFromOuterClassInInnerClassInInheritor3.kt | 0 ...erClassInInnerClassInInheritor3.pretty.txt | 0 ...FromOuterClassInInnerClassInInheritor3.txt | 0 ...ava_util_Collection.descriptors.pretty.txt | 0 ...ement_java_util_Collection.descriptors.txt | 0 .../Implement_java_util_Collection.kt | 0 .../Implement_java_util_Collection.pretty.txt | 0 .../Implement_java_util_Collection.txt | 0 ...rTypeParameterBound.descriptors.pretty.txt | 0 ...ithOuterTypeParameterBound.descriptors.txt | 0 ...mberFunctionWithOuterTypeParameterBound.kt | 0 ...tionWithOuterTypeParameterBound.pretty.txt | 0 ...berFunctionWithOuterTypeParameterBound.txt | 0 ...rTypeParameterBound.descriptors.pretty.txt | 0 ...ithOuterTypeParameterBound.descriptors.txt | 0 ...mberPropertyWithOuterTypeParameterBound.kt | 0 ...ertyWithOuterTypeParameterBound.pretty.txt | 0 ...berPropertyWithOuterTypeParameterBound.txt | 0 .../tests/analysis/api/analysisApi.kt | 76 +++++++++---------- 166 files changed, 184 insertions(+), 191 deletions(-) rename analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/{scopes => components/scopeProvider}/Fe10IdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java (76%) rename analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/{scopes => components/scopeProvider}/Fe10IdeNormalAnalysisSourceModuleFileScopeTestGenerated.java (79%) rename analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/{scopes => components/scopeProvider}/FirIdeDependentAnalysisSourceModuleScopeContextForPositionTestGenerated.java (95%) rename analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/{scopes => components/scopeProvider}/FirIdeDependentAnalysisSourceModuleTypeScopeTestGenerated.java (96%) rename analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/{scopes => components/scopeProvider}/FirIdeNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated.java (76%) rename analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/{scopes => components/scopeProvider}/FirIdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java (76%) rename analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/{scopes => components/scopeProvider}/FirIdeNormalAnalysisSourceModuleFileScopeTestGenerated.java (79%) rename analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/{scopes => components/scopeProvider}/FirIdeNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java (63%) rename analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/{scopes => components/scopeProvider}/FirIdeNormalAnalysisSourceModuleScopeContextForPositionTestGenerated.java (95%) rename analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/{scopes => components/scopeProvider}/FirIdeNormalAnalysisSourceModuleSubstitutionOverridesUnwrappingTestGenerated.java (63%) rename analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/{scopes => components/scopeProvider}/FirIdeNormalAnalysisSourceModuleTypeScopeTestGenerated.java (96%) rename analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/{scopes => components/scopeProvider}/AbstractDeclaredMemberScopeTest.kt (93%) rename analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/{scopes => components/scopeProvider}/AbstractDelegateMemberScopeTest.kt (88%) rename analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/{scopes => components/scopeProvider}/AbstractFileScopeTest.kt (93%) rename analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/{scopes => components/scopeProvider}/AbstractMemberScopeByFqNameTest.kt (88%) rename analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/{scopes => components/scopeProvider}/AbstractScopeContextForPositionTest.kt (98%) rename analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/{scopes => components/scopeProvider}/AbstractSubstitutionOverridesUnwrappingTest.kt (93%) rename analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/{scopes => components/scopeProvider}/AbstractTypeScopeTest.kt (92%) rename analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/{scopes => components/scopeProvider}/FirStandaloneNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated.java (76%) rename analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/{scopes => components/scopeProvider}/FirStandaloneNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java (76%) rename analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/{scopes => components/scopeProvider}/FirStandaloneNormalAnalysisSourceModuleFileScopeTestGenerated.java (79%) rename analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/{scopes => components/scopeProvider}/FirStandaloneNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java (67%) rename analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/{scopes => components/scopeProvider}/FirStandaloneNormalAnalysisSourceModuleScopeContextForPositionTestGenerated.java (95%) rename analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/{scopes => components/scopeProvider}/FirStandaloneNormalAnalysisSourceModuleSubstitutionOverridesUnwrappingTestGenerated.java (63%) rename analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/{scopes => components/scopeProvider}/FirStandaloneNormalAnalysisSourceModuleTypeScopeTestGenerated.java (96%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/declaredMemberScope/javaDeclaredEnhancementScope.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/declaredMemberScope/javaDeclaredEnhancementScope.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/declaredMemberScope/javaDeclaredEnhancementScope.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/declaredMemberScope/javaDeclaredInheritList.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/declaredMemberScope/javaDeclaredInheritList.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/declaredMemberScope/javaDeclaredInheritList.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/declaredMemberScope/javaInnerClassConstructor.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/declaredMemberScope/javaInnerClassConstructor.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/declaredMemberScope/javaInnerClassConstructor.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/delegatedMemberScope/propertyWithGetter.descriptors.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/delegatedMemberScope/propertyWithGetter.descriptors.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/delegatedMemberScope/propertyWithGetter.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/delegatedMemberScope/propertyWithGetter.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/delegatedMemberScope/propertyWithGetter.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/delegatedMemberScope/simple.descriptors.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/delegatedMemberScope/simple.descriptors.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/delegatedMemberScope/simple.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/delegatedMemberScope/simple.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/delegatedMemberScope/simple.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/delegatedMemberScope/withOverridden.descriptors.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/delegatedMemberScope/withOverridden.descriptors.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/delegatedMemberScope/withOverridden.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/delegatedMemberScope/withOverridden.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/delegatedMemberScope/withOverridden.txt (96%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/fileScopeTest/fileScope.descriptors.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/fileScopeTest/fileScope.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/fileScopeTest/fileScope.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/fileScopeTest/simpleFileScope.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/fileScopeTest/simpleFileScope.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/Int.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/Int.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/Int.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/MutableList.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/MutableList.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/MutableList.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/dataClass.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/dataClass.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/dataClass.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/emumEntryWithoutMembers.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/emumEntryWithoutMembers.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/emumEntryWithoutMembers.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/enumEntry.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/enumEntry.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/enumEntry.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/java.lang.String.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/java.lang.String.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/java.lang.String.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/javaField.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/javaField.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/javaField.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/javaFieldClash.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/javaFieldClash.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/javaFieldClash.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/javaMethods.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/javaMethods.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/javaMethods.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/kotlin.Function2.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/kotlin.Function2.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/kotlin.Function2.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/overridenFunctionWithGenericBound.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/overridenFunctionWithGenericBound.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase1.descriptors.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase1.descriptors.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase1.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase1.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase1.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase2.descriptors.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase2.descriptors.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase2.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase2.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase2.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase3.descriptors.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase3.descriptors.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase3.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase3.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase3.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase4.descriptors.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase4.descriptors.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase4.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase4.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/ClassWithGenericBase4.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.descriptors.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.descriptors.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.descriptors.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.descriptors.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.descriptors.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.descriptors.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.descriptors.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.descriptors.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.descriptors.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.descriptors.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.descriptors.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.descriptors.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.descriptors.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.descriptors.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/Implement_java_util_Collection.descriptors.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/Implement_java_util_Collection.descriptors.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/Implement_java_util_Collection.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/Implement_java_util_Collection.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.descriptors.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.descriptors.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.descriptors.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.descriptors.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.kt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.pretty.txt (100%) rename analysis/analysis-api/testData/{scopes => components/scopeProvider}/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.txt (100%) diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/scopes/Fe10IdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/scopeProvider/Fe10IdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java similarity index 76% rename from analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/scopes/Fe10IdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java rename to analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/scopeProvider/Fe10IdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java index 142cde31267..f579cb5a179 100644 --- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/scopes/Fe10IdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java +++ b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/scopeProvider/Fe10IdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.fe10.test.cases.generated.cases.scopes; +package org.jetbrains.kotlin.analysis.api.fe10.test.cases.generated.cases.components.scopeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -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.scopes.AbstractDelegateMemberScopeTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractDelegateMemberScopeTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ 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/scopes/delegatedMemberScope") +@TestMetadata("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope") @TestDataPath("$PROJECT_ROOT") public class Fe10IdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated extends AbstractDelegateMemberScopeTest { @NotNull @@ -43,24 +43,24 @@ public class Fe10IdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated e @Test public void testAllFilesPresentInDelegatedMemberScope() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/scopes/delegatedMemberScope"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("propertyWithGetter.kt") public void testPropertyWithGetter() throws Exception { - runTest("analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.kt"); } @Test @TestMetadata("simple.kt") public void testSimple() throws Exception { - runTest("analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.kt"); } @Test @TestMetadata("withOverridden.kt") public void testWithOverridden() throws Exception { - runTest("analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.kt"); } } diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/scopes/Fe10IdeNormalAnalysisSourceModuleFileScopeTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/scopeProvider/Fe10IdeNormalAnalysisSourceModuleFileScopeTestGenerated.java similarity index 79% rename from analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/scopes/Fe10IdeNormalAnalysisSourceModuleFileScopeTestGenerated.java rename to analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/scopeProvider/Fe10IdeNormalAnalysisSourceModuleFileScopeTestGenerated.java index 2d07e709002..a0de95b8c7c 100644 --- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/scopes/Fe10IdeNormalAnalysisSourceModuleFileScopeTestGenerated.java +++ b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/scopeProvider/Fe10IdeNormalAnalysisSourceModuleFileScopeTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.fe10.test.cases.generated.cases.scopes; +package org.jetbrains.kotlin.analysis.api.fe10.test.cases.generated.cases.components.scopeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -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.scopes.AbstractFileScopeTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractFileScopeTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ 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/scopes/fileScopeTest") +@TestMetadata("analysis/analysis-api/testData/components/scopeProvider/fileScopeTest") @TestDataPath("$PROJECT_ROOT") public class Fe10IdeNormalAnalysisSourceModuleFileScopeTestGenerated extends AbstractFileScopeTest { @NotNull @@ -43,18 +43,18 @@ public class Fe10IdeNormalAnalysisSourceModuleFileScopeTestGenerated extends Abs @Test public void testAllFilesPresentInFileScopeTest() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/scopes/fileScopeTest"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/fileScopeTest"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("fileScope.kt") public void testFileScope() throws Exception { - runTest("analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/fileScopeTest/fileScope.kt"); } @Test @TestMetadata("simpleFileScope.kt") public void testSimpleFileScope() throws Exception { - runTest("analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/fileScopeTest/simpleFileScope.kt"); } } diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeDependentAnalysisSourceModuleScopeContextForPositionTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeDependentAnalysisSourceModuleScopeContextForPositionTestGenerated.java similarity index 95% rename from analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeDependentAnalysisSourceModuleScopeContextForPositionTestGenerated.java rename to analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeDependentAnalysisSourceModuleScopeContextForPositionTestGenerated.java index 6f3c33cacb5..0544e0c6a63 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeDependentAnalysisSourceModuleScopeContextForPositionTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeDependentAnalysisSourceModuleScopeContextForPositionTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.scopes; +package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.components.scopeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -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.scopes.AbstractScopeContextForPositionTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractScopeContextForPositionTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeDependentAnalysisSourceModuleTypeScopeTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeDependentAnalysisSourceModuleTypeScopeTestGenerated.java similarity index 96% rename from analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeDependentAnalysisSourceModuleTypeScopeTestGenerated.java rename to analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeDependentAnalysisSourceModuleTypeScopeTestGenerated.java index 916b95347f9..967fbdd63bd 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeDependentAnalysisSourceModuleTypeScopeTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeDependentAnalysisSourceModuleTypeScopeTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.scopes; +package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.components.scopeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -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.scopes.AbstractTypeScopeTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractTypeScopeTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated.java similarity index 76% rename from analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated.java rename to analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated.java index 10a7f1984de..7e17165c023 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.scopes; +package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.components.scopeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -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.scopes.AbstractDeclaredMemberScopeTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractDeclaredMemberScopeTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ 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/scopes/declaredMemberScope") +@TestMetadata("analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope") @TestDataPath("$PROJECT_ROOT") public class FirIdeNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated extends AbstractDeclaredMemberScopeTest { @NotNull @@ -43,24 +43,24 @@ public class FirIdeNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated ex @Test public void testAllFilesPresentInDeclaredMemberScope() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/scopes/declaredMemberScope"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("javaDeclaredEnhancementScope.kt") public void testJavaDeclaredEnhancementScope() throws Exception { - runTest("analysis/analysis-api/testData/scopes/declaredMemberScope/javaDeclaredEnhancementScope.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaDeclaredEnhancementScope.kt"); } @Test @TestMetadata("javaDeclaredInheritList.kt") public void testJavaDeclaredInheritList() throws Exception { - runTest("analysis/analysis-api/testData/scopes/declaredMemberScope/javaDeclaredInheritList.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaDeclaredInheritList.kt"); } @Test @TestMetadata("javaInnerClassConstructor.kt") public void testJavaInnerClassConstructor() throws Exception { - runTest("analysis/analysis-api/testData/scopes/declaredMemberScope/javaInnerClassConstructor.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaInnerClassConstructor.kt"); } } diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java similarity index 76% rename from analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java rename to analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java index e2741901d6d..9a55f844e08 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.scopes; +package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.components.scopeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -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.scopes.AbstractDelegateMemberScopeTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractDelegateMemberScopeTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ 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/scopes/delegatedMemberScope") +@TestMetadata("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope") @TestDataPath("$PROJECT_ROOT") public class FirIdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated extends AbstractDelegateMemberScopeTest { @NotNull @@ -43,24 +43,24 @@ public class FirIdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated ex @Test public void testAllFilesPresentInDelegatedMemberScope() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/scopes/delegatedMemberScope"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("propertyWithGetter.kt") public void testPropertyWithGetter() throws Exception { - runTest("analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.kt"); } @Test @TestMetadata("simple.kt") public void testSimple() throws Exception { - runTest("analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.kt"); } @Test @TestMetadata("withOverridden.kt") public void testWithOverridden() throws Exception { - runTest("analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.kt"); } } diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleFileScopeTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleFileScopeTestGenerated.java similarity index 79% rename from analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleFileScopeTestGenerated.java rename to analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleFileScopeTestGenerated.java index 0db187a79f3..c36eb636be5 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleFileScopeTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleFileScopeTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.scopes; +package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.components.scopeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -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.scopes.AbstractFileScopeTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractFileScopeTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ 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/scopes/fileScopeTest") +@TestMetadata("analysis/analysis-api/testData/components/scopeProvider/fileScopeTest") @TestDataPath("$PROJECT_ROOT") public class FirIdeNormalAnalysisSourceModuleFileScopeTestGenerated extends AbstractFileScopeTest { @NotNull @@ -43,18 +43,18 @@ public class FirIdeNormalAnalysisSourceModuleFileScopeTestGenerated extends Abst @Test public void testAllFilesPresentInFileScopeTest() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/scopes/fileScopeTest"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/fileScopeTest"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("fileScope.kt") public void testFileScope() throws Exception { - runTest("analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/fileScopeTest/fileScope.kt"); } @Test @TestMetadata("simpleFileScope.kt") public void testSimpleFileScope() throws Exception { - runTest("analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/fileScopeTest/simpleFileScope.kt"); } } diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java similarity index 63% rename from analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java rename to analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java index 872983af6cb..a3fa8038244 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.scopes; +package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.components.scopeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -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.scopes.AbstractMemberScopeByFqNameTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractMemberScopeByFqNameTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ 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/scopes/memberScopeByFqName") +@TestMetadata("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName") @TestDataPath("$PROJECT_ROOT") public class FirIdeNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated extends AbstractMemberScopeByFqNameTest { @NotNull @@ -43,94 +43,94 @@ public class FirIdeNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated ex @Test public void testAllFilesPresentInMemberScopeByFqName() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/scopes/memberScopeByFqName"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("dataClass.kt") public void testDataClass() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/dataClass.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/dataClass.kt"); } @Test @TestMetadata("emumEntryWithoutMembers.kt") public void testEmumEntryWithoutMembers() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/emumEntryWithoutMembers.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/emumEntryWithoutMembers.kt"); } @Test @TestMetadata("enumEntry.kt") public void testEnumEntry() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntry.kt"); } @Test @TestMetadata("Int.kt") public void testInt() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/Int.kt"); } @Test @TestMetadata("javaField.kt") public void testJavaField() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/javaField.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaField.kt"); } @Test @TestMetadata("javaFieldClash.kt") public void testJavaFieldClash() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/javaFieldClash.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaFieldClash.kt"); } @Test @TestMetadata("javaMethods.kt") public void testJavaMethods() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/javaMethods.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaMethods.kt"); } @Test @TestMetadata("java.lang.String.kt") public void testJava_lang_String() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/java.lang.String.kt"); } @Test @TestMetadata("kotlin.Function2.kt") public void testKotlin_Function2() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/kotlin.Function2.kt"); } @Test @TestMetadata("MutableList.kt") public void testMutableList() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/MutableList.kt"); } @Nested - @TestMetadata("analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled") + @TestMetadata("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled") @TestDataPath("$PROJECT_ROOT") public class WithTestCompilerPluginEnabled { @Test public void testAllFilesPresentInWithTestCompilerPluginEnabled() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("customSerlializable.kt") public void testCustomSerlializable() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.kt"); } @Test @TestMetadata("generatedCompanionWithFoo.kt") public void testGeneratedCompanionWithFoo() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.kt"); } @Test @TestMetadata("nestedClassAndMaterializeMember.kt") public void testNestedClassAndMaterializeMember() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.kt"); } } } diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleScopeContextForPositionTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleScopeContextForPositionTestGenerated.java similarity index 95% rename from analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleScopeContextForPositionTestGenerated.java rename to analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleScopeContextForPositionTestGenerated.java index 3d88c1f14ed..268cc0b0eb2 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleScopeContextForPositionTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleScopeContextForPositionTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.scopes; +package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.components.scopeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -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.scopes.AbstractScopeContextForPositionTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractScopeContextForPositionTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleSubstitutionOverridesUnwrappingTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleSubstitutionOverridesUnwrappingTestGenerated.java similarity index 63% rename from analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleSubstitutionOverridesUnwrappingTestGenerated.java rename to analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleSubstitutionOverridesUnwrappingTestGenerated.java index 6fcdc93eb1f..2fee1912245 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleSubstitutionOverridesUnwrappingTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleSubstitutionOverridesUnwrappingTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.scopes; +package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.components.scopeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -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.scopes.AbstractSubstitutionOverridesUnwrappingTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractSubstitutionOverridesUnwrappingTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ 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/scopes/substitutionOverridesUnwrapping") +@TestMetadata("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping") @TestDataPath("$PROJECT_ROOT") public class FirIdeNormalAnalysisSourceModuleSubstitutionOverridesUnwrappingTestGenerated extends AbstractSubstitutionOverridesUnwrappingTest { @NotNull @@ -43,90 +43,90 @@ public class FirIdeNormalAnalysisSourceModuleSubstitutionOverridesUnwrappingTest @Test public void testAllFilesPresentInSubstitutionOverridesUnwrapping() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("ClassWithGenericBase1.kt") public void testClassWithGenericBase1() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.kt"); } @Test @TestMetadata("ClassWithGenericBase2.kt") public void testClassWithGenericBase2() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.kt"); } @Test @TestMetadata("ClassWithGenericBase3.kt") public void testClassWithGenericBase3() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.kt"); } @Test @TestMetadata("ClassWithGenericBase4.kt") public void testClassWithGenericBase4() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.kt"); } @Test @TestMetadata("GenericFromFunctionInLocalClass1.kt") public void testGenericFromFunctionInLocalClass1() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.kt"); } @Test @TestMetadata("GenericFromFunctionInLocalClass2.kt") public void testGenericFromFunctionInLocalClass2() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.kt"); } @Test @TestMetadata("GenericFromOuterClassInInnerClass1.kt") public void testGenericFromOuterClassInInnerClass1() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.kt"); } @Test @TestMetadata("GenericFromOuterClassInInnerClass2.kt") public void testGenericFromOuterClassInInnerClass2() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.kt"); } @Test @TestMetadata("GenericFromOuterClassInInnerClassInInheritor1.kt") public void testGenericFromOuterClassInInnerClassInInheritor1() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.kt"); } @Test @TestMetadata("GenericFromOuterClassInInnerClassInInheritor2.kt") public void testGenericFromOuterClassInInnerClassInInheritor2() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.kt"); } @Test @TestMetadata("GenericFromOuterClassInInnerClassInInheritor3.kt") public void testGenericFromOuterClassInInnerClassInInheritor3() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.kt"); } @Test @TestMetadata("Implement_java_util_Collection.kt") public void testImplement_java_util_Collection() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.kt"); } @Test @TestMetadata("MemberFunctionWithOuterTypeParameterBound.kt") public void testMemberFunctionWithOuterTypeParameterBound() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.kt"); } @Test @TestMetadata("MemberPropertyWithOuterTypeParameterBound.kt") public void testMemberPropertyWithOuterTypeParameterBound() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.kt"); } } diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleTypeScopeTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleTypeScopeTestGenerated.java similarity index 96% rename from analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleTypeScopeTestGenerated.java rename to analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleTypeScopeTestGenerated.java index 42df54b37f4..8b52179c28b 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/scopes/FirIdeNormalAnalysisSourceModuleTypeScopeTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleTypeScopeTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.scopes; +package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.cases.components.scopeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -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.scopes.AbstractTypeScopeTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractTypeScopeTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractDeclaredMemberScopeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractDeclaredMemberScopeTest.kt similarity index 93% rename from analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractDeclaredMemberScopeTest.kt rename to analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractDeclaredMemberScopeTest.kt index e69a5d2b3ad..20443d5dfea 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractDeclaredMemberScopeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractDeclaredMemberScopeTest.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.scopes +package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.impl.base.test.SymbolByFqName diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractDelegateMemberScopeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractDelegateMemberScopeTest.kt similarity index 88% rename from analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractDelegateMemberScopeTest.kt rename to analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractDelegateMemberScopeTest.kt index efb54dccc98..5240a3f8a34 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractDelegateMemberScopeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractDelegateMemberScopeTest.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.scopes +package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.impl.base.test.SymbolByFqName diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractFileScopeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractFileScopeTest.kt similarity index 93% rename from analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractFileScopeTest.kt rename to analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractFileScopeTest.kt index 0265da30da5..75efd536ea1 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractFileScopeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractFileScopeTest.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.scopes +package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractMemberScopeByFqNameTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractMemberScopeByFqNameTest.kt similarity index 88% rename from analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractMemberScopeByFqNameTest.kt rename to analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractMemberScopeByFqNameTest.kt index 64218ab9477..9aa8fef684f 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractMemberScopeByFqNameTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractMemberScopeByFqNameTest.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.scopes +package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.impl.base.test.SymbolByFqName diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractScopeContextForPositionTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractScopeContextForPositionTest.kt similarity index 98% rename from analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractScopeContextForPositionTest.kt rename to analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractScopeContextForPositionTest.kt index 4c8cebf95f0..37128c47a50 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractScopeContextForPositionTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractScopeContextForPositionTest.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.scopes +package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.components.KtScopeContext diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractSubstitutionOverridesUnwrappingTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractSubstitutionOverridesUnwrappingTest.kt similarity index 93% rename from analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractSubstitutionOverridesUnwrappingTest.kt rename to analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractSubstitutionOverridesUnwrappingTest.kt index f30fe92dece..0b0925ad1af 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractSubstitutionOverridesUnwrappingTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractSubstitutionOverridesUnwrappingTest.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.scopes +package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractTypeScopeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractTypeScopeTest.kt similarity index 92% rename from analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractTypeScopeTest.kt rename to analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractTypeScopeTest.kt index a6c2b67cbdc..c1adbad3a83 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/scopes/AbstractTypeScopeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/scopeProvider/AbstractTypeScopeTest.kt @@ -1,14 +1,9 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -/* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.scopes +package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.prettyPrintSignature diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated.java similarity index 76% rename from analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated.java rename to analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated.java index e576ca7108f..e661ba5d83e 100644 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated.java +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.generated.cases.scopes; +package org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.generated.cases.components.scopeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -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.scopes.AbstractDeclaredMemberScopeTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractDeclaredMemberScopeTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ 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/scopes/declaredMemberScope") +@TestMetadata("analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope") @TestDataPath("$PROJECT_ROOT") public class FirStandaloneNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated extends AbstractDeclaredMemberScopeTest { @NotNull @@ -43,24 +43,24 @@ public class FirStandaloneNormalAnalysisSourceModuleDeclaredMemberScopeTestGener @Test public void testAllFilesPresentInDeclaredMemberScope() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/scopes/declaredMemberScope"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("javaDeclaredEnhancementScope.kt") public void testJavaDeclaredEnhancementScope() throws Exception { - runTest("analysis/analysis-api/testData/scopes/declaredMemberScope/javaDeclaredEnhancementScope.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaDeclaredEnhancementScope.kt"); } @Test @TestMetadata("javaDeclaredInheritList.kt") public void testJavaDeclaredInheritList() throws Exception { - runTest("analysis/analysis-api/testData/scopes/declaredMemberScope/javaDeclaredInheritList.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaDeclaredInheritList.kt"); } @Test @TestMetadata("javaInnerClassConstructor.kt") public void testJavaInnerClassConstructor() throws Exception { - runTest("analysis/analysis-api/testData/scopes/declaredMemberScope/javaInnerClassConstructor.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaInnerClassConstructor.kt"); } } diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java similarity index 76% rename from analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java rename to analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java index a5ff328f335..e819f1db694 100644 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.generated.cases.scopes; +package org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.generated.cases.components.scopeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -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.scopes.AbstractDelegateMemberScopeTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractDelegateMemberScopeTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ 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/scopes/delegatedMemberScope") +@TestMetadata("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope") @TestDataPath("$PROJECT_ROOT") public class FirStandaloneNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated extends AbstractDelegateMemberScopeTest { @NotNull @@ -43,24 +43,24 @@ public class FirStandaloneNormalAnalysisSourceModuleDelegateMemberScopeTestGener @Test public void testAllFilesPresentInDelegatedMemberScope() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/scopes/delegatedMemberScope"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("propertyWithGetter.kt") public void testPropertyWithGetter() throws Exception { - runTest("analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.kt"); } @Test @TestMetadata("simple.kt") public void testSimple() throws Exception { - runTest("analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.kt"); } @Test @TestMetadata("withOverridden.kt") public void testWithOverridden() throws Exception { - runTest("analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.kt"); } } diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleFileScopeTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleFileScopeTestGenerated.java similarity index 79% rename from analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleFileScopeTestGenerated.java rename to analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleFileScopeTestGenerated.java index 006d7cf2176..ee9da5a2178 100644 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleFileScopeTestGenerated.java +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleFileScopeTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.generated.cases.scopes; +package org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.generated.cases.components.scopeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -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.scopes.AbstractFileScopeTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractFileScopeTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ 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/scopes/fileScopeTest") +@TestMetadata("analysis/analysis-api/testData/components/scopeProvider/fileScopeTest") @TestDataPath("$PROJECT_ROOT") public class FirStandaloneNormalAnalysisSourceModuleFileScopeTestGenerated extends AbstractFileScopeTest { @NotNull @@ -43,18 +43,18 @@ public class FirStandaloneNormalAnalysisSourceModuleFileScopeTestGenerated exten @Test public void testAllFilesPresentInFileScopeTest() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/scopes/fileScopeTest"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/fileScopeTest"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("fileScope.kt") public void testFileScope() throws Exception { - runTest("analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/fileScopeTest/fileScope.kt"); } @Test @TestMetadata("simpleFileScope.kt") public void testSimpleFileScope() throws Exception { - runTest("analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/fileScopeTest/simpleFileScope.kt"); } } diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java similarity index 67% rename from analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java rename to analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java index c85306ddc2a..f78b52d4568 100644 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.generated.cases.scopes; +package org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.generated.cases.components.scopeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -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.scopes.AbstractMemberScopeByFqNameTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractMemberScopeByFqNameTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ 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/scopes/memberScopeByFqName") +@TestMetadata("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName") @TestDataPath("$PROJECT_ROOT") public class FirStandaloneNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated extends AbstractMemberScopeByFqNameTest { @NotNull @@ -43,66 +43,66 @@ public class FirStandaloneNormalAnalysisSourceModuleMemberScopeByFqNameTestGener @Test public void testAllFilesPresentInMemberScopeByFqName() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/scopes/memberScopeByFqName"), Pattern.compile("^(.+)\\.kt$"), null, true, "withTestCompilerPluginEnabled"); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName"), Pattern.compile("^(.+)\\.kt$"), null, true, "withTestCompilerPluginEnabled"); } @Test @TestMetadata("dataClass.kt") public void testDataClass() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/dataClass.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/dataClass.kt"); } @Test @TestMetadata("emumEntryWithoutMembers.kt") public void testEmumEntryWithoutMembers() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/emumEntryWithoutMembers.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/emumEntryWithoutMembers.kt"); } @Test @TestMetadata("enumEntry.kt") public void testEnumEntry() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntry.kt"); } @Test @TestMetadata("Int.kt") public void testInt() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/Int.kt"); } @Test @TestMetadata("javaField.kt") public void testJavaField() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/javaField.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaField.kt"); } @Test @TestMetadata("javaFieldClash.kt") public void testJavaFieldClash() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/javaFieldClash.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaFieldClash.kt"); } @Test @TestMetadata("javaMethods.kt") public void testJavaMethods() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/javaMethods.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaMethods.kt"); } @Test @TestMetadata("java.lang.String.kt") public void testJava_lang_String() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/java.lang.String.kt"); } @Test @TestMetadata("kotlin.Function2.kt") public void testKotlin_Function2() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/kotlin.Function2.kt"); } @Test @TestMetadata("MutableList.kt") public void testMutableList() throws Exception { - runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/MutableList.kt"); } } diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleScopeContextForPositionTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleScopeContextForPositionTestGenerated.java similarity index 95% rename from analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleScopeContextForPositionTestGenerated.java rename to analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleScopeContextForPositionTestGenerated.java index cc5c7c6505a..af48da44030 100644 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleScopeContextForPositionTestGenerated.java +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleScopeContextForPositionTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.generated.cases.scopes; +package org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.generated.cases.components.scopeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -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.scopes.AbstractScopeContextForPositionTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractScopeContextForPositionTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleSubstitutionOverridesUnwrappingTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleSubstitutionOverridesUnwrappingTestGenerated.java similarity index 63% rename from analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleSubstitutionOverridesUnwrappingTestGenerated.java rename to analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleSubstitutionOverridesUnwrappingTestGenerated.java index dd06c92898f..0ed9f1d2bf4 100644 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleSubstitutionOverridesUnwrappingTestGenerated.java +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleSubstitutionOverridesUnwrappingTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.generated.cases.scopes; +package org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.generated.cases.components.scopeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -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.scopes.AbstractSubstitutionOverridesUnwrappingTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractSubstitutionOverridesUnwrappingTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ 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/scopes/substitutionOverridesUnwrapping") +@TestMetadata("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping") @TestDataPath("$PROJECT_ROOT") public class FirStandaloneNormalAnalysisSourceModuleSubstitutionOverridesUnwrappingTestGenerated extends AbstractSubstitutionOverridesUnwrappingTest { @NotNull @@ -43,90 +43,90 @@ public class FirStandaloneNormalAnalysisSourceModuleSubstitutionOverridesUnwrapp @Test public void testAllFilesPresentInSubstitutionOverridesUnwrapping() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("ClassWithGenericBase1.kt") public void testClassWithGenericBase1() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.kt"); } @Test @TestMetadata("ClassWithGenericBase2.kt") public void testClassWithGenericBase2() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.kt"); } @Test @TestMetadata("ClassWithGenericBase3.kt") public void testClassWithGenericBase3() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.kt"); } @Test @TestMetadata("ClassWithGenericBase4.kt") public void testClassWithGenericBase4() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.kt"); } @Test @TestMetadata("GenericFromFunctionInLocalClass1.kt") public void testGenericFromFunctionInLocalClass1() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.kt"); } @Test @TestMetadata("GenericFromFunctionInLocalClass2.kt") public void testGenericFromFunctionInLocalClass2() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.kt"); } @Test @TestMetadata("GenericFromOuterClassInInnerClass1.kt") public void testGenericFromOuterClassInInnerClass1() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.kt"); } @Test @TestMetadata("GenericFromOuterClassInInnerClass2.kt") public void testGenericFromOuterClassInInnerClass2() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.kt"); } @Test @TestMetadata("GenericFromOuterClassInInnerClassInInheritor1.kt") public void testGenericFromOuterClassInInnerClassInInheritor1() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.kt"); } @Test @TestMetadata("GenericFromOuterClassInInnerClassInInheritor2.kt") public void testGenericFromOuterClassInInnerClassInInheritor2() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.kt"); } @Test @TestMetadata("GenericFromOuterClassInInnerClassInInheritor3.kt") public void testGenericFromOuterClassInInnerClassInInheritor3() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.kt"); } @Test @TestMetadata("Implement_java_util_Collection.kt") public void testImplement_java_util_Collection() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.kt"); } @Test @TestMetadata("MemberFunctionWithOuterTypeParameterBound.kt") public void testMemberFunctionWithOuterTypeParameterBound() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.kt"); } @Test @TestMetadata("MemberPropertyWithOuterTypeParameterBound.kt") public void testMemberPropertyWithOuterTypeParameterBound() throws Exception { - runTest("analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.kt"); + runTest("analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.kt"); } } diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleTypeScopeTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleTypeScopeTestGenerated.java similarity index 96% rename from analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleTypeScopeTestGenerated.java rename to analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleTypeScopeTestGenerated.java index 08e92c087b5..fa239dd6476 100644 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/scopes/FirStandaloneNormalAnalysisSourceModuleTypeScopeTestGenerated.java +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleTypeScopeTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.generated.cases.scopes; +package org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.generated.cases.components.scopeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -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.scopes.AbstractTypeScopeTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.AbstractTypeScopeTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/analysis/analysis-api/testData/scopes/declaredMemberScope/javaDeclaredEnhancementScope.kt b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaDeclaredEnhancementScope.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/declaredMemberScope/javaDeclaredEnhancementScope.kt rename to analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaDeclaredEnhancementScope.kt diff --git a/analysis/analysis-api/testData/scopes/declaredMemberScope/javaDeclaredEnhancementScope.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaDeclaredEnhancementScope.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/declaredMemberScope/javaDeclaredEnhancementScope.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaDeclaredEnhancementScope.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/declaredMemberScope/javaDeclaredEnhancementScope.txt b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaDeclaredEnhancementScope.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/declaredMemberScope/javaDeclaredEnhancementScope.txt rename to analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaDeclaredEnhancementScope.txt diff --git a/analysis/analysis-api/testData/scopes/declaredMemberScope/javaDeclaredInheritList.kt b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaDeclaredInheritList.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/declaredMemberScope/javaDeclaredInheritList.kt rename to analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaDeclaredInheritList.kt diff --git a/analysis/analysis-api/testData/scopes/declaredMemberScope/javaDeclaredInheritList.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaDeclaredInheritList.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/declaredMemberScope/javaDeclaredInheritList.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaDeclaredInheritList.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/declaredMemberScope/javaDeclaredInheritList.txt b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaDeclaredInheritList.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/declaredMemberScope/javaDeclaredInheritList.txt rename to analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaDeclaredInheritList.txt diff --git a/analysis/analysis-api/testData/scopes/declaredMemberScope/javaInnerClassConstructor.kt b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaInnerClassConstructor.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/declaredMemberScope/javaInnerClassConstructor.kt rename to analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaInnerClassConstructor.kt diff --git a/analysis/analysis-api/testData/scopes/declaredMemberScope/javaInnerClassConstructor.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaInnerClassConstructor.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/declaredMemberScope/javaInnerClassConstructor.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaInnerClassConstructor.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/declaredMemberScope/javaInnerClassConstructor.txt b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaInnerClassConstructor.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/declaredMemberScope/javaInnerClassConstructor.txt rename to analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaInnerClassConstructor.txt diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.descriptors.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.descriptors.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.descriptors.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.descriptors.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.descriptors.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.descriptors.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.descriptors.txt rename to analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.descriptors.txt diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.kt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.kt rename to analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.kt diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.txt rename to analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.txt diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.descriptors.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.descriptors.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.descriptors.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.descriptors.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.descriptors.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.descriptors.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.descriptors.txt rename to analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.descriptors.txt diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.kt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.kt rename to analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.kt diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.txt rename to analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.txt diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.descriptors.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.descriptors.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.descriptors.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.descriptors.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.descriptors.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.descriptors.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.descriptors.txt rename to analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.descriptors.txt diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.kt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.kt rename to analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.kt diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.txt similarity index 96% rename from analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.txt rename to analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.txt index 3ebee0d979d..6daf2d5eefa 100644 --- a/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.txt @@ -30,4 +30,4 @@ KtFunctionSymbol: ownTypeArguments: [] type: B getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.descriptors.txt b/analysis/analysis-api/testData/components/scopeProvider/fileScopeTest/fileScope.descriptors.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.descriptors.txt rename to analysis/analysis-api/testData/components/scopeProvider/fileScopeTest/fileScope.descriptors.txt diff --git a/analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.kt b/analysis/analysis-api/testData/components/scopeProvider/fileScopeTest/fileScope.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.kt rename to analysis/analysis-api/testData/components/scopeProvider/fileScopeTest/fileScope.kt diff --git a/analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.txt b/analysis/analysis-api/testData/components/scopeProvider/fileScopeTest/fileScope.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.txt rename to analysis/analysis-api/testData/components/scopeProvider/fileScopeTest/fileScope.txt diff --git a/analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.kt b/analysis/analysis-api/testData/components/scopeProvider/fileScopeTest/simpleFileScope.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.kt rename to analysis/analysis-api/testData/components/scopeProvider/fileScopeTest/simpleFileScope.kt diff --git a/analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.txt b/analysis/analysis-api/testData/components/scopeProvider/fileScopeTest/simpleFileScope.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.txt rename to analysis/analysis-api/testData/components/scopeProvider/fileScopeTest/simpleFileScope.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/Int.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/Int.kt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/Int.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/Int.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/Int.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/Int.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/MutableList.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/MutableList.kt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/MutableList.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/MutableList.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/MutableList.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/MutableList.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/dataClass.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/dataClass.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/dataClass.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/dataClass.kt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/dataClass.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/dataClass.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/dataClass.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/dataClass.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/dataClass.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/dataClass.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/dataClass.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/dataClass.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/emumEntryWithoutMembers.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/emumEntryWithoutMembers.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/emumEntryWithoutMembers.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/emumEntryWithoutMembers.kt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/emumEntryWithoutMembers.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/emumEntryWithoutMembers.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/emumEntryWithoutMembers.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/emumEntryWithoutMembers.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/emumEntryWithoutMembers.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/emumEntryWithoutMembers.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/emumEntryWithoutMembers.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/emumEntryWithoutMembers.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntry.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntry.kt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntry.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntry.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntry.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntry.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/java.lang.String.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/java.lang.String.kt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/java.lang.String.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/java.lang.String.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/java.lang.String.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/java.lang.String.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaField.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaField.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/javaField.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaField.kt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaField.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaField.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/javaField.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaField.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaField.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaField.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/javaField.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaField.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaFieldClash.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaFieldClash.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/javaFieldClash.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaFieldClash.kt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaFieldClash.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaFieldClash.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/javaFieldClash.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaFieldClash.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaFieldClash.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaFieldClash.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/javaFieldClash.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaFieldClash.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaMethods.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaMethods.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/javaMethods.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaMethods.kt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaMethods.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaMethods.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/javaMethods.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaMethods.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/javaMethods.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaMethods.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/javaMethods.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/javaMethods.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/kotlin.Function2.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/kotlin.Function2.kt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/kotlin.Function2.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/kotlin.Function2.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/kotlin.Function2.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/kotlin.Function2.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/overridenFunctionWithGenericBound.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/overridenFunctionWithGenericBound.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/overridenFunctionWithGenericBound.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/overridenFunctionWithGenericBound.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/overridenFunctionWithGenericBound.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/overridenFunctionWithGenericBound.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/overridenFunctionWithGenericBound.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/overridenFunctionWithGenericBound.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.kt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.kt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.kt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.kt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.txt rename to analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.descriptors.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.descriptors.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.descriptors.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.descriptors.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.descriptors.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.descriptors.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.descriptors.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.descriptors.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.kt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.kt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.kt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.descriptors.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.descriptors.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.descriptors.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.descriptors.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.descriptors.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.descriptors.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.descriptors.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.descriptors.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.kt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.kt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.kt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.descriptors.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.descriptors.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.descriptors.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.descriptors.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.descriptors.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.descriptors.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.descriptors.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.descriptors.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.kt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.kt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.kt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.descriptors.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.descriptors.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.descriptors.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.descriptors.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.descriptors.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.descriptors.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.descriptors.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.descriptors.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.kt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.kt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.kt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.descriptors.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.descriptors.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.descriptors.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.descriptors.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.descriptors.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.descriptors.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.descriptors.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.descriptors.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.kt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.kt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.kt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.descriptors.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.descriptors.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.descriptors.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.descriptors.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.descriptors.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.descriptors.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.descriptors.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.descriptors.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.kt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.kt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.kt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.descriptors.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.descriptors.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.descriptors.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.descriptors.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.descriptors.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.descriptors.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.descriptors.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.descriptors.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.kt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.kt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.kt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.descriptors.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.descriptors.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.descriptors.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.descriptors.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.descriptors.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.descriptors.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.descriptors.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.descriptors.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.kt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.kt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.kt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.descriptors.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.descriptors.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.descriptors.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.descriptors.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.descriptors.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.descriptors.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.descriptors.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.descriptors.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.kt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.kt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.kt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.descriptors.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.descriptors.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.descriptors.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.descriptors.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.descriptors.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.descriptors.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.descriptors.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.descriptors.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.kt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.kt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.kt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.descriptors.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.descriptors.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.descriptors.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.descriptors.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.descriptors.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.descriptors.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.descriptors.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.descriptors.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.kt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.kt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.kt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.descriptors.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.descriptors.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.descriptors.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.descriptors.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.descriptors.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.descriptors.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.descriptors.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.descriptors.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.kt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.kt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.kt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.descriptors.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.descriptors.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.descriptors.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.descriptors.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.descriptors.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.descriptors.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.descriptors.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.descriptors.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.kt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.kt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.kt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.descriptors.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.descriptors.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.descriptors.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.descriptors.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.descriptors.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.descriptors.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.descriptors.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.descriptors.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.kt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.kt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.kt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.kt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.pretty.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.pretty.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.pretty.txt diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.txt similarity index 100% rename from analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.txt rename to analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.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 889b1ebec3f..56c0eb417ca 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 @@ -27,6 +27,7 @@ import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.importO import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.multiplatformInfoProvider.AbstractExpectForActualTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.psiTypeProvider.AbstractAnalysisApiExpressionPsiTypeProviderTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.psiTypeProvider.AbstractAnalysisApiPsiTypeProviderTest +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.scopeProvider.* import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.signatureSubstitution.AbstractAnalysisApiSignatureContractsTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.signatureSubstitution.AbstractAnalysisApiSignatureSubstitutionTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.signatureSubstitution.AbstractAnalysisApiSymbolAsSignatureTest @@ -46,7 +47,6 @@ import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.typePro import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.typeProvider.AbstractTypeReferenceTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.references.AbstractReferenceResolveTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.references.AbstractReferenceShortenerTest -import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.scopes.* import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.symbols.AbstractSingleSymbolByPsi import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.symbols.AbstractSymbolByFqNameTest import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.symbols.AbstractSymbolByPsiTest @@ -90,42 +90,6 @@ internal fun AnalysisApiTestGroup.generateAnalysisApiTests() { } private fun AnalysisApiTestGroup.generateAnalysisApiNonComponentsTests() { - group("scopes", filter = analysisSessionModeIs(AnalysisSessionMode.Normal)) { - test( - AbstractSubstitutionOverridesUnwrappingTest::class, - filter = frontendIs(FrontendKind.Fir), - ) { - model("substitutionOverridesUnwrapping") - } - - test( - AbstractMemberScopeByFqNameTest::class, - filter = frontendIs(FrontendKind.Fir), - ) { - when (it.analysisApiMode) { - AnalysisApiMode.Ide -> - model("memberScopeByFqName") - AnalysisApiMode.Standalone -> - model("memberScopeByFqName", excludeDirsRecursively = listOf("withTestCompilerPluginEnabled")) - } - } - - test(AbstractFileScopeTest::class) { - model("fileScopeTest", extension = "kt") - } - - test(AbstractDelegateMemberScopeTest::class) { - model("delegatedMemberScope") - } - - test( - AbstractDeclaredMemberScopeTest::class, - filter = frontendIs(FrontendKind.Fir), - ) { - model("declaredMemberScope") - } - } - group("symbols", filter = analysisSessionModeIs(AnalysisSessionMode.Normal)) { test(AbstractSymbolByPsiTest::class) { model("symbolByPsi") @@ -415,12 +379,46 @@ private fun AnalysisApiTestGroup.generateAnalysisApiComponentsTests() { test(AbstractTypeScopeTest::class) { model("typeScope") } - } - group(filter = frontendIs(FrontendKind.Fir)) { test(AbstractScopeContextForPositionTest::class) { model("scopeContextForPosition") } } + + group(filter = analysisSessionModeIs(AnalysisSessionMode.Normal)) { + test( + AbstractSubstitutionOverridesUnwrappingTest::class, + filter = frontendIs(FrontendKind.Fir), + ) { + model("substitutionOverridesUnwrapping") + } + + test( + AbstractMemberScopeByFqNameTest::class, + filter = frontendIs(FrontendKind.Fir), + ) { + when (it.analysisApiMode) { + AnalysisApiMode.Ide -> + model("memberScopeByFqName") + AnalysisApiMode.Standalone -> + model("memberScopeByFqName", excludeDirsRecursively = listOf("withTestCompilerPluginEnabled")) + } + } + + test(AbstractFileScopeTest::class) { + model("fileScopeTest", extension = "kt") + } + + test(AbstractDelegateMemberScopeTest::class) { + model("delegatedMemberScope") + } + + test( + AbstractDeclaredMemberScopeTest::class, + filter = frontendIs(FrontendKind.Fir), + ) { + model("declaredMemberScope") + } + } } }