Revert "KT-61890 [AA] Use ContextCollector in KtFirScopeProvider"

This reverts commit 47a00bf9

See KTIJ-27918

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt

@@ -23,16 +23,13 @@ import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithMembers
 import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirResolveSession
 import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFirFile
-import org.jetbrains.kotlin.analysis.low.level.api.fir.util.ContextCollector
 import org.jetbrains.kotlin.analysis.utils.errors.unexpectedElementError
-import org.jetbrains.kotlin.analysis.utils.printer.parentOfType
 import org.jetbrains.kotlin.fir.declarations.FirClass
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
 import org.jetbrains.kotlin.fir.declarations.utils.delegateFields
 import org.jetbrains.kotlin.fir.java.JavaScopeProvider
 import org.jetbrains.kotlin.fir.java.declarations.FirJavaClass
 import org.jetbrains.kotlin.fir.resolve.ScopeSession
-import org.jetbrains.kotlin.fir.resolve.SessionHolderImpl
 import org.jetbrains.kotlin.fir.resolve.calls.FirSyntheticPropertiesScope
 import org.jetbrains.kotlin.fir.resolve.scope
 import org.jetbrains.kotlin.fir.resolve.scopeSessionKey
@@ -41,7 +38,6 @@ import org.jetbrains.kotlin.fir.scopes.impl.*
 import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhaseWithCallableMembers
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
-import org.jetbrains.kotlin.kdoc.psi.api.KDoc
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtElement
@@ -256,22 +252,9 @@ internal class KtFirScopeProvider(
         originalFile: KtFile,
         positionInFakeFile: KtElement
     ): KtScopeContext {
-        val fakeFile = positionInFakeFile.containingKtFile
-
-        // If the position is in KDoc, we want to pass the owning declaration to the ContextCollector.
-        // That way, the resulting scope will contain all the nested declarations which can be references by KDoc.
-        val parentKDoc = positionInFakeFile.parentOfType<KDoc>()
-        val correctedPosition = parentKDoc?.owner ?: positionInFakeFile
-
-        val context = ContextCollector.process(
-            fakeFile.getOrBuildFirFile(firResolveSession),
-            SessionHolderImpl(analysisSession.useSiteSession, getScopeSession()),
-            correctedPosition,
-        )
-
         val towerDataContext =
-            context?.towerDataContext
+            analysisSession.firResolveSession.getTowerContextProvider(originalFile).getClosestAvailableParentContext(positionInFakeFile)
-                ?: errorWithAttachment("Cannot find context for ${positionInFakeFile::class}") {
+                ?: errorWithAttachment("Cannot find enclosing declaration for ${positionInFakeFile::class}") {
                     withPsiEntry("positionInFakeFile", positionInFakeFile)
                 }
         val towerDataElementsIndexed = towerDataContext.towerDataElements.asReversed().withIndex()

analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeDependentAnalysisSourceModuleScopeContextForPositionTestGenerated.java

@@ -52,18 +52,6 @@ public class FirIdeDependentAnalysisSourceModuleScopeContextForPositionTestGener
         runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/annotationWithoutDeclaration.kt");
     }
 
-    @Test
-    @TestMetadata("classPropertyDelegate.kt")
-    public void testClassPropertyDelegate() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyDelegate.kt");
-    }
-
-    @Test
-    @TestMetadata("classPropertyInitializer.kt")
-    public void testClassPropertyInitializer() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyInitializer.kt");
-    }
-
     @Test
     @TestMetadata("contextReceiver.kt")
     public void testContextReceiver() throws Exception {
@@ -160,36 +148,6 @@ public class FirIdeDependentAnalysisSourceModuleScopeContextForPositionTestGener
         runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInWhenEntryCondition.kt");
     }
 
-    @Test
-    @TestMetadata("superTypeConstructor.kt")
-    public void testSuperTypeConstructor() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor.kt");
-    }
-
-    @Test
-    @TestMetadata("superTypeConstructor_lambda.kt")
-    public void testSuperTypeConstructor_lambda() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_lambda.kt");
-    }
-
-    @Test
-    @TestMetadata("superTypeConstructor_nestedClasses.kt")
-    public void testSuperTypeConstructor_nestedClasses() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses.kt");
-    }
-
-    @Test
-    @TestMetadata("superTypeConstructor_nestedClasses_typeArgument.kt")
-    public void testSuperTypeConstructor_nestedClasses_typeArgument() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses_typeArgument.kt");
-    }
-
-    @Test
-    @TestMetadata("superTypeDelegate.kt")
-    public void testSuperTypeDelegate() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeDelegate.kt");
-    }
-
     @Test
     @TestMetadata("syntheticPropertiesScope.kt")
     public void testSyntheticPropertiesScope() throws Exception {

analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleScopeContextForPositionTestGenerated.java

@@ -52,18 +52,6 @@ public class FirIdeNormalAnalysisSourceModuleScopeContextForPositionTestGenerate
         runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/annotationWithoutDeclaration.kt");
     }
 
-    @Test
-    @TestMetadata("classPropertyDelegate.kt")
-    public void testClassPropertyDelegate() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyDelegate.kt");
-    }
-
-    @Test
-    @TestMetadata("classPropertyInitializer.kt")
-    public void testClassPropertyInitializer() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyInitializer.kt");
-    }
-
     @Test
     @TestMetadata("contextReceiver.kt")
     public void testContextReceiver() throws Exception {
@@ -160,36 +148,6 @@ public class FirIdeNormalAnalysisSourceModuleScopeContextForPositionTestGenerate
         runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInWhenEntryCondition.kt");
     }
 
-    @Test
-    @TestMetadata("superTypeConstructor.kt")
-    public void testSuperTypeConstructor() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor.kt");
-    }
-
-    @Test
-    @TestMetadata("superTypeConstructor_lambda.kt")
-    public void testSuperTypeConstructor_lambda() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_lambda.kt");
-    }
-
-    @Test
-    @TestMetadata("superTypeConstructor_nestedClasses.kt")
-    public void testSuperTypeConstructor_nestedClasses() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses.kt");
-    }
-
-    @Test
-    @TestMetadata("superTypeConstructor_nestedClasses_typeArgument.kt")
-    public void testSuperTypeConstructor_nestedClasses_typeArgument() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses_typeArgument.kt");
-    }
-
-    @Test
-    @TestMetadata("superTypeDelegate.kt")
-    public void testSuperTypeDelegate() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeDelegate.kt");
-    }
-
     @Test
     @TestMetadata("syntheticPropertiesScope.kt")
     public void testSyntheticPropertiesScope() throws Exception {

analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleScopeContextForPositionTestGenerated.java

@@ -52,18 +52,6 @@ public class FirStandaloneNormalAnalysisSourceModuleScopeContextForPositionTestG
         runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/annotationWithoutDeclaration.kt");
     }
 
-    @Test
-    @TestMetadata("classPropertyDelegate.kt")
-    public void testClassPropertyDelegate() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyDelegate.kt");
-    }
-
-    @Test
-    @TestMetadata("classPropertyInitializer.kt")
-    public void testClassPropertyInitializer() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyInitializer.kt");
-    }
-
     @Test
     @TestMetadata("contextReceiver.kt")
     public void testContextReceiver() throws Exception {
@@ -160,36 +148,6 @@ public class FirStandaloneNormalAnalysisSourceModuleScopeContextForPositionTestG
         runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInWhenEntryCondition.kt");
     }
 
-    @Test
-    @TestMetadata("superTypeConstructor.kt")
-    public void testSuperTypeConstructor() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor.kt");
-    }
-
-    @Test
-    @TestMetadata("superTypeConstructor_lambda.kt")
-    public void testSuperTypeConstructor_lambda() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_lambda.kt");
-    }
-
-    @Test
-    @TestMetadata("superTypeConstructor_nestedClasses.kt")
-    public void testSuperTypeConstructor_nestedClasses() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses.kt");
-    }
-
-    @Test
-    @TestMetadata("superTypeConstructor_nestedClasses_typeArgument.kt")
-    public void testSuperTypeConstructor_nestedClasses_typeArgument() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses_typeArgument.kt");
-    }
-
-    @Test
-    @TestMetadata("superTypeDelegate.kt")
-    public void testSuperTypeDelegate() throws Exception {
-        runTest("analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeDelegate.kt");
-    }
-
     @Test
     @TestMetadata("syntheticPropertiesScope.kt")
     public void testSyntheticPropertiesScope() throws Exception {

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyDelegate.kt

@@ -1,12 +0,0 @@
-package test
-
-open class Base(val value: Int) {
-    fun baseMember(): Int = value
-    val baseProp: Int = value
-}
-
-class Child(val constructorProp: Int, constructorParam: Int) : Base(10) {
-    fun childMember(): Int = value
-
-    val childProp: Int by <expr>::value</expr>
-}

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyDelegate.pretty.txt

@@ -1,56 +0,0 @@
-element: ::value
-implicit receivers:
-  type: test.Child
-  owner symbol: KtFirNamedClassOrObjectSymbol
-
-scopes:
-  LocalScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 1
-      constructorParam: kotlin.Int
-    constructors: 0
-
-  TypeScope, index = 1
-    packages: 0
-    classifiers: 0
-    callables: 9
-      val constructorProp: kotlin.Int
-      fun childMember(): kotlin.Int
-      val childProp: kotlin.Int
-        get()
-      val value: kotlin.Int
-      fun baseMember(): kotlin.Int
-      val baseProp: kotlin.Int
-      fun equals(other: kotlin.Any?): kotlin.Boolean
-      fun hashCode(): kotlin.Int
-      fun toString(): kotlin.String
-    constructors: 1
-      constructor(constructorProp: kotlin.Int, constructorParam: kotlin.Int)
-
-  ExplicitSimpleImportingScope, index = 2
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 3
-    packages: 0
-    classifiers: 2
-      class Base(value: kotlin.Int)
-      class Child(constructorProp: kotlin.Int, constructorParam: kotlin.Int) : test.Base()
-    callables: 0
-    constructors: 0
-
-  DefaultSimpleImportingScope, index = 4
-
-  DefaultSimpleImportingScope, index = 5
-
-  ExplicitStarImportingScope, index = 6
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultStarImportingScope, index = 7
-

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyDelegate.txt

@@ -1,671 +0,0 @@
-element: ::value
-implicit receivers:
-  type: KtUsualClassType:
-    annotationsList: []
-    ownTypeArguments: []
-    type: test/Child
-  owner symbol: KtFirNamedClassOrObjectSymbol
-
-scopes:
-  LocalScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 1
-      KtValueParameterSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: null
-        contextReceivers: []
-        generatedPrimaryConstructorProperty: null
-        hasDefaultValue: false
-        isCrossinline: false
-        isExtension: false
-        isImplicitLambdaParameter: false
-        isNoinline: false
-        isVararg: false
-        name: constructorParam
-        origin: SOURCE
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Int
-        symbolKind: LOCAL
-        typeParameters: []
-    constructors: 0
-
-  TypeScope, index = 1
-    packages: 0
-    classifiers: 0
-    callables: 9
-      KtKotlinPropertySymbol:
-        annotationsList: []
-        backingFieldSymbol: KtBackingFieldSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          isExtension: false
-          name: field
-          origin: PROPERTY_BACKING_FIELD
-          owningProperty: KtKotlinPropertySymbol(test/Child.constructorProp)
-          receiverParameter: null
-          returnType: KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Int
-          symbolKind: LOCAL
-          typeParameters: []
-        callableIdIfNonLocal: test/Child.constructorProp
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverParameter: null
-          returnType: KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: KtNonConstantInitializerValue(val constructorProp: Int)
-        isActual: false
-        isConst: false
-        isDelegatedProperty: false
-        isExpect: false
-        isExtension: false
-        isFromPrimaryConstructor: true
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: constructorProp
-        origin: SOURCE
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
-      KtFunctionSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: test/Child.childMember
-        contextReceivers: []
-        contractEffects: []
-        hasStableParameterNames: true
-        isActual: false
-        isBuiltinFunctionInvoke: false
-        isExpect: false
-        isExtension: false
-        isExternal: false
-        isInfix: false
-        isInline: false
-        isOperator: false
-        isOverride: false
-        isStatic: false
-        isSuspend: false
-        modality: FINAL
-        name: childMember
-        origin: SOURCE
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Int
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        valueParameters: []
-        visibility: Public
-      KtKotlinPropertySymbol:
-        annotationsList: []
-        backingFieldSymbol: KtBackingFieldSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          isExtension: false
-          name: field
-          origin: PROPERTY_BACKING_FIELD
-          owningProperty: KtKotlinPropertySymbol(test/Child.childProp)
-          receiverParameter: null
-          returnType: KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Int
-          symbolKind: LOCAL
-          typeParameters: []
-        callableIdIfNonLocal: test/Child.childProp
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: true
-          hasStableParameterNames: true
-          isDefault: false
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverParameter: null
-          returnType: KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: false
-        hasGetter: true
-        hasSetter: false
-        initializer: null
-        isActual: false
-        isConst: false
-        isDelegatedProperty: true
-        isExpect: false
-        isExtension: false
-        isFromPrimaryConstructor: false
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: childProp
-        origin: SOURCE
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
-      KtKotlinPropertySymbol:
-        annotationsList: []
-        backingFieldSymbol: KtBackingFieldSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          isExtension: false
-          name: field
-          origin: PROPERTY_BACKING_FIELD
-          owningProperty: KtKotlinPropertySymbol(test/Base.value)
-          receiverParameter: null
-          returnType: KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Int
-          symbolKind: LOCAL
-          typeParameters: []
-        callableIdIfNonLocal: test/Base.value
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverParameter: null
-          returnType: KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: KtNonConstantInitializerValue(val value: Int)
-        isActual: false
-        isConst: false
-        isDelegatedProperty: false
-        isExpect: false
-        isExtension: false
-        isFromPrimaryConstructor: true
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: value
-        origin: SOURCE
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
-      KtFunctionSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: test/Base.baseMember
-        contextReceivers: []
-        contractEffects: []
-        hasStableParameterNames: true
-        isActual: false
-        isBuiltinFunctionInvoke: false
-        isExpect: false
-        isExtension: false
-        isExternal: false
-        isInfix: false
-        isInline: false
-        isOperator: false
-        isOverride: false
-        isStatic: false
-        isSuspend: false
-        modality: FINAL
-        name: baseMember
-        origin: SOURCE
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Int
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        valueParameters: []
-        visibility: Public
-      KtKotlinPropertySymbol:
-        annotationsList: []
-        backingFieldSymbol: KtBackingFieldSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          isExtension: false
-          name: field
-          origin: PROPERTY_BACKING_FIELD
-          owningProperty: KtKotlinPropertySymbol(test/Base.baseProp)
-          receiverParameter: null
-          returnType: KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Int
-          symbolKind: LOCAL
-          typeParameters: []
-        callableIdIfNonLocal: test/Base.baseProp
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverParameter: null
-          returnType: KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: KtNonConstantInitializerValue(value)
-        isActual: false
-        isConst: false
-        isDelegatedProperty: false
-        isExpect: false
-        isExtension: false
-        isFromPrimaryConstructor: false
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: baseProp
-        origin: SOURCE
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
-      KtFunctionSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: kotlin/Any.equals
-        contextReceivers: []
-        contractEffects: []
-        hasStableParameterNames: true
-        isActual: false
-        isBuiltinFunctionInvoke: false
-        isExpect: false
-        isExtension: false
-        isExternal: false
-        isInfix: false
-        isInline: false
-        isOperator: true
-        isOverride: false
-        isStatic: false
-        isSuspend: false
-        modality: OPEN
-        name: equals
-        origin: LIBRARY
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Boolean
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        valueParameters: [
-          KtValueParameterSymbol:
-            annotationsList: []
-            callableIdIfNonLocal: null
-            contextReceivers: []
-            generatedPrimaryConstructorProperty: null
-            hasDefaultValue: false
-            isCrossinline: false
-            isExtension: false
-            isImplicitLambdaParameter: false
-            isNoinline: false
-            isVararg: false
-            name: other
-            origin: LIBRARY
-            receiverParameter: null
-            returnType: KtUsualClassType:
-              annotationsList: []
-              ownTypeArguments: []
-              type: kotlin/Any?
-            symbolKind: LOCAL
-            typeParameters: []
-        ]
-        visibility: Public
-      KtFunctionSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: kotlin/Any.hashCode
-        contextReceivers: []
-        contractEffects: []
-        hasStableParameterNames: true
-        isActual: false
-        isBuiltinFunctionInvoke: false
-        isExpect: false
-        isExtension: false
-        isExternal: false
-        isInfix: false
-        isInline: false
-        isOperator: false
-        isOverride: false
-        isStatic: false
-        isSuspend: false
-        modality: OPEN
-        name: hashCode
-        origin: LIBRARY
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Int
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        valueParameters: []
-        visibility: Public
-      KtFunctionSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: kotlin/Any.toString
-        contextReceivers: []
-        contractEffects: []
-        hasStableParameterNames: true
-        isActual: false
-        isBuiltinFunctionInvoke: false
-        isExpect: false
-        isExtension: false
-        isExternal: false
-        isInfix: false
-        isInline: false
-        isOperator: false
-        isOverride: false
-        isStatic: false
-        isSuspend: false
-        modality: OPEN
-        name: toString
-        origin: LIBRARY
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/String
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        valueParameters: []
-        visibility: Public
-    constructors: 1
-      KtConstructorSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: null
-        containingClassIdIfNonLocal: test/Child
-        contextReceivers: []
-        hasStableParameterNames: true
-        isActual: false
-        isExpect: false
-        isExtension: false
-        isPrimary: true
-        origin: SOURCE
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: test/Child
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        valueParameters: [
-          KtValueParameterSymbol:
-            annotationsList: []
-            callableIdIfNonLocal: null
-            contextReceivers: []
-            generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-              annotationsList: []
-              backingFieldSymbol: KtBackingFieldSymbol:
-                annotationsList: []
-                callableIdIfNonLocal: null
-                contextReceivers: []
-                isExtension: false
-                name: field
-                origin: PROPERTY_BACKING_FIELD
-                owningProperty: KtKotlinPropertySymbol(test/Child.constructorProp)
-                receiverParameter: null
-                returnType: KtUsualClassType:
-                  annotationsList: []
-                  ownTypeArguments: []
-                  type: kotlin/Int
-                symbolKind: LOCAL
-                typeParameters: []
-              callableIdIfNonLocal: test/Child.constructorProp
-              contextReceivers: []
-              getter: KtPropertyGetterSymbol:
-                annotationsList: []
-                callableIdIfNonLocal: null
-                contextReceivers: []
-                hasBody: false
-                hasStableParameterNames: true
-                isDefault: true
-                isExtension: false
-                isInline: false
-                isOverride: false
-                modality: FINAL
-                origin: SOURCE
-                receiverParameter: null
-                returnType: KtUsualClassType:
-                  annotationsList: []
-                  ownTypeArguments: []
-                  type: kotlin/Int
-                symbolKind: ACCESSOR
-                typeParameters: []
-                valueParameters: []
-                visibility: Public
-              hasBackingField: true
-              hasGetter: true
-              hasSetter: false
-              initializer: KtNonConstantInitializerValue(val constructorProp: Int)
-              isActual: false
-              isConst: false
-              isDelegatedProperty: false
-              isExpect: false
-              isExtension: false
-              isFromPrimaryConstructor: true
-              isLateInit: false
-              isOverride: false
-              isStatic: false
-              isVal: true
-              modality: FINAL
-              name: constructorProp
-              origin: SOURCE
-              receiverParameter: null
-              returnType: KtUsualClassType:
-                annotationsList: []
-                ownTypeArguments: []
-                type: kotlin/Int
-              setter: null
-              symbolKind: CLASS_MEMBER
-              typeParameters: []
-              visibility: Public
-            hasDefaultValue: false
-            isCrossinline: false
-            isExtension: false
-            isImplicitLambdaParameter: false
-            isNoinline: false
-            isVararg: false
-            name: constructorProp
-            origin: SOURCE
-            receiverParameter: null
-            returnType: KtUsualClassType:
-              annotationsList: []
-              ownTypeArguments: []
-              type: kotlin/Int
-            symbolKind: LOCAL
-            typeParameters: []
-          KtValueParameterSymbol:
-            annotationsList: []
-            callableIdIfNonLocal: null
-            contextReceivers: []
-            generatedPrimaryConstructorProperty: null
-            hasDefaultValue: false
-            isCrossinline: false
-            isExtension: false
-            isImplicitLambdaParameter: false
-            isNoinline: false
-            isVararg: false
-            name: constructorParam
-            origin: SOURCE
-            receiverParameter: null
-            returnType: KtUsualClassType:
-              annotationsList: []
-              ownTypeArguments: []
-              type: kotlin/Int
-            symbolKind: LOCAL
-            typeParameters: []
-        ]
-        visibility: Public
-
-  ExplicitSimpleImportingScope, index = 2
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 3
-    packages: 0
-    classifiers: 2
-      KtNamedClassOrObjectSymbol:
-        annotationsList: []
-        classIdIfNonLocal: test/Base
-        classKind: CLASS
-        companionObject: null
-        contextReceivers: []
-        isActual: false
-        isData: false
-        isExpect: false
-        isExternal: false
-        isFun: false
-        isInline: false
-        isInner: false
-        modality: OPEN
-        name: Base
-        origin: SOURCE
-        superTypes: [
-          KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Any
-        ]
-        symbolKind: TOP_LEVEL
-        typeParameters: []
-        visibility: Public
-      KtNamedClassOrObjectSymbol:
-        annotationsList: []
-        classIdIfNonLocal: test/Child
-        classKind: CLASS
-        companionObject: null
-        contextReceivers: []
-        isActual: false
-        isData: false
-        isExpect: false
-        isExternal: false
-        isFun: false
-        isInline: false
-        isInner: false
-        modality: FINAL
-        name: Child
-        origin: SOURCE
-        superTypes: [
-          KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: test/Base
-        ]
-        symbolKind: TOP_LEVEL
-        typeParameters: []
-        visibility: Public
-    callables: 0
-    constructors: 0
-
-  DefaultSimpleImportingScope, index = 4
-
-  DefaultSimpleImportingScope, index = 5
-
-  ExplicitStarImportingScope, index = 6
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultStarImportingScope, index = 7
-

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyInitializer.kt

@@ -1,12 +0,0 @@
-package test
-
-open class Base(val value: Int) {
-    fun baseMember(): Int = value
-    val baseProp: Int = value
-}
-
-class Child(val constructorProp: Int, constructorParam: Int) : Base(10) {
-    fun childMember(): Int = value
-
-    val childProp: Int = <expr>value</expr>
-}

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyInitializer.pretty.txt

@@ -1,55 +0,0 @@
-element: value
-implicit receivers:
-  type: test.Child
-  owner symbol: KtFirNamedClassOrObjectSymbol
-
-scopes:
-  LocalScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 1
-      constructorParam: kotlin.Int
-    constructors: 0
-
-  TypeScope, index = 1
-    packages: 0
-    classifiers: 0
-    callables: 9
-      val constructorProp: kotlin.Int
-      fun childMember(): kotlin.Int
-      val childProp: kotlin.Int
-      val value: kotlin.Int
-      fun baseMember(): kotlin.Int
-      val baseProp: kotlin.Int
-      fun equals(other: kotlin.Any?): kotlin.Boolean
-      fun hashCode(): kotlin.Int
-      fun toString(): kotlin.String
-    constructors: 1
-      constructor(constructorProp: kotlin.Int, constructorParam: kotlin.Int)
-
-  ExplicitSimpleImportingScope, index = 2
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 3
-    packages: 0
-    classifiers: 2
-      class Base(value: kotlin.Int)
-      class Child(constructorProp: kotlin.Int, constructorParam: kotlin.Int) : test.Base()
-    callables: 0
-    constructors: 0
-
-  DefaultSimpleImportingScope, index = 4
-
-  DefaultSimpleImportingScope, index = 5
-
-  ExplicitStarImportingScope, index = 6
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultStarImportingScope, index = 7
-

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyInitializer.txt

@@ -1,671 +0,0 @@
-element: value
-implicit receivers:
-  type: KtUsualClassType:
-    annotationsList: []
-    ownTypeArguments: []
-    type: test/Child
-  owner symbol: KtFirNamedClassOrObjectSymbol
-
-scopes:
-  LocalScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 1
-      KtValueParameterSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: null
-        contextReceivers: []
-        generatedPrimaryConstructorProperty: null
-        hasDefaultValue: false
-        isCrossinline: false
-        isExtension: false
-        isImplicitLambdaParameter: false
-        isNoinline: false
-        isVararg: false
-        name: constructorParam
-        origin: SOURCE
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Int
-        symbolKind: LOCAL
-        typeParameters: []
-    constructors: 0
-
-  TypeScope, index = 1
-    packages: 0
-    classifiers: 0
-    callables: 9
-      KtKotlinPropertySymbol:
-        annotationsList: []
-        backingFieldSymbol: KtBackingFieldSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          isExtension: false
-          name: field
-          origin: PROPERTY_BACKING_FIELD
-          owningProperty: KtKotlinPropertySymbol(test/Child.constructorProp)
-          receiverParameter: null
-          returnType: KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Int
-          symbolKind: LOCAL
-          typeParameters: []
-        callableIdIfNonLocal: test/Child.constructorProp
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverParameter: null
-          returnType: KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: KtNonConstantInitializerValue(val constructorProp: Int)
-        isActual: false
-        isConst: false
-        isDelegatedProperty: false
-        isExpect: false
-        isExtension: false
-        isFromPrimaryConstructor: true
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: constructorProp
-        origin: SOURCE
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
-      KtFunctionSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: test/Child.childMember
-        contextReceivers: []
-        contractEffects: []
-        hasStableParameterNames: true
-        isActual: false
-        isBuiltinFunctionInvoke: false
-        isExpect: false
-        isExtension: false
-        isExternal: false
-        isInfix: false
-        isInline: false
-        isOperator: false
-        isOverride: false
-        isStatic: false
-        isSuspend: false
-        modality: FINAL
-        name: childMember
-        origin: SOURCE
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Int
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        valueParameters: []
-        visibility: Public
-      KtKotlinPropertySymbol:
-        annotationsList: []
-        backingFieldSymbol: KtBackingFieldSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          isExtension: false
-          name: field
-          origin: PROPERTY_BACKING_FIELD
-          owningProperty: KtKotlinPropertySymbol(test/Child.childProp)
-          receiverParameter: null
-          returnType: KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Int
-          symbolKind: LOCAL
-          typeParameters: []
-        callableIdIfNonLocal: test/Child.childProp
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverParameter: null
-          returnType: KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: KtNonConstantInitializerValue(value)
-        isActual: false
-        isConst: false
-        isDelegatedProperty: false
-        isExpect: false
-        isExtension: false
-        isFromPrimaryConstructor: false
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: childProp
-        origin: SOURCE
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
-      KtKotlinPropertySymbol:
-        annotationsList: []
-        backingFieldSymbol: KtBackingFieldSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          isExtension: false
-          name: field
-          origin: PROPERTY_BACKING_FIELD
-          owningProperty: KtKotlinPropertySymbol(test/Base.value)
-          receiverParameter: null
-          returnType: KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Int
-          symbolKind: LOCAL
-          typeParameters: []
-        callableIdIfNonLocal: test/Base.value
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverParameter: null
-          returnType: KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: KtNonConstantInitializerValue(val value: Int)
-        isActual: false
-        isConst: false
-        isDelegatedProperty: false
-        isExpect: false
-        isExtension: false
-        isFromPrimaryConstructor: true
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: value
-        origin: SOURCE
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
-      KtFunctionSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: test/Base.baseMember
-        contextReceivers: []
-        contractEffects: []
-        hasStableParameterNames: true
-        isActual: false
-        isBuiltinFunctionInvoke: false
-        isExpect: false
-        isExtension: false
-        isExternal: false
-        isInfix: false
-        isInline: false
-        isOperator: false
-        isOverride: false
-        isStatic: false
-        isSuspend: false
-        modality: FINAL
-        name: baseMember
-        origin: SOURCE
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Int
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        valueParameters: []
-        visibility: Public
-      KtKotlinPropertySymbol:
-        annotationsList: []
-        backingFieldSymbol: KtBackingFieldSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          isExtension: false
-          name: field
-          origin: PROPERTY_BACKING_FIELD
-          owningProperty: KtKotlinPropertySymbol(test/Base.baseProp)
-          receiverParameter: null
-          returnType: KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Int
-          symbolKind: LOCAL
-          typeParameters: []
-        callableIdIfNonLocal: test/Base.baseProp
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverParameter: null
-          returnType: KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: KtNonConstantInitializerValue(value)
-        isActual: false
-        isConst: false
-        isDelegatedProperty: false
-        isExpect: false
-        isExtension: false
-        isFromPrimaryConstructor: false
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: baseProp
-        origin: SOURCE
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
-      KtFunctionSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: kotlin/Any.equals
-        contextReceivers: []
-        contractEffects: []
-        hasStableParameterNames: true
-        isActual: false
-        isBuiltinFunctionInvoke: false
-        isExpect: false
-        isExtension: false
-        isExternal: false
-        isInfix: false
-        isInline: false
-        isOperator: true
-        isOverride: false
-        isStatic: false
-        isSuspend: false
-        modality: OPEN
-        name: equals
-        origin: LIBRARY
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Boolean
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        valueParameters: [
-          KtValueParameterSymbol:
-            annotationsList: []
-            callableIdIfNonLocal: null
-            contextReceivers: []
-            generatedPrimaryConstructorProperty: null
-            hasDefaultValue: false
-            isCrossinline: false
-            isExtension: false
-            isImplicitLambdaParameter: false
-            isNoinline: false
-            isVararg: false
-            name: other
-            origin: LIBRARY
-            receiverParameter: null
-            returnType: KtUsualClassType:
-              annotationsList: []
-              ownTypeArguments: []
-              type: kotlin/Any?
-            symbolKind: LOCAL
-            typeParameters: []
-        ]
-        visibility: Public
-      KtFunctionSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: kotlin/Any.hashCode
-        contextReceivers: []
-        contractEffects: []
-        hasStableParameterNames: true
-        isActual: false
-        isBuiltinFunctionInvoke: false
-        isExpect: false
-        isExtension: false
-        isExternal: false
-        isInfix: false
-        isInline: false
-        isOperator: false
-        isOverride: false
-        isStatic: false
-        isSuspend: false
-        modality: OPEN
-        name: hashCode
-        origin: LIBRARY
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Int
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        valueParameters: []
-        visibility: Public
-      KtFunctionSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: kotlin/Any.toString
-        contextReceivers: []
-        contractEffects: []
-        hasStableParameterNames: true
-        isActual: false
-        isBuiltinFunctionInvoke: false
-        isExpect: false
-        isExtension: false
-        isExternal: false
-        isInfix: false
-        isInline: false
-        isOperator: false
-        isOverride: false
-        isStatic: false
-        isSuspend: false
-        modality: OPEN
-        name: toString
-        origin: LIBRARY
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/String
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        valueParameters: []
-        visibility: Public
-    constructors: 1
-      KtConstructorSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: null
-        containingClassIdIfNonLocal: test/Child
-        contextReceivers: []
-        hasStableParameterNames: true
-        isActual: false
-        isExpect: false
-        isExtension: false
-        isPrimary: true
-        origin: SOURCE
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: test/Child
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        valueParameters: [
-          KtValueParameterSymbol:
-            annotationsList: []
-            callableIdIfNonLocal: null
-            contextReceivers: []
-            generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-              annotationsList: []
-              backingFieldSymbol: KtBackingFieldSymbol:
-                annotationsList: []
-                callableIdIfNonLocal: null
-                contextReceivers: []
-                isExtension: false
-                name: field
-                origin: PROPERTY_BACKING_FIELD
-                owningProperty: KtKotlinPropertySymbol(test/Child.constructorProp)
-                receiverParameter: null
-                returnType: KtUsualClassType:
-                  annotationsList: []
-                  ownTypeArguments: []
-                  type: kotlin/Int
-                symbolKind: LOCAL
-                typeParameters: []
-              callableIdIfNonLocal: test/Child.constructorProp
-              contextReceivers: []
-              getter: KtPropertyGetterSymbol:
-                annotationsList: []
-                callableIdIfNonLocal: null
-                contextReceivers: []
-                hasBody: false
-                hasStableParameterNames: true
-                isDefault: true
-                isExtension: false
-                isInline: false
-                isOverride: false
-                modality: FINAL
-                origin: SOURCE
-                receiverParameter: null
-                returnType: KtUsualClassType:
-                  annotationsList: []
-                  ownTypeArguments: []
-                  type: kotlin/Int
-                symbolKind: ACCESSOR
-                typeParameters: []
-                valueParameters: []
-                visibility: Public
-              hasBackingField: true
-              hasGetter: true
-              hasSetter: false
-              initializer: KtNonConstantInitializerValue(val constructorProp: Int)
-              isActual: false
-              isConst: false
-              isDelegatedProperty: false
-              isExpect: false
-              isExtension: false
-              isFromPrimaryConstructor: true
-              isLateInit: false
-              isOverride: false
-              isStatic: false
-              isVal: true
-              modality: FINAL
-              name: constructorProp
-              origin: SOURCE
-              receiverParameter: null
-              returnType: KtUsualClassType:
-                annotationsList: []
-                ownTypeArguments: []
-                type: kotlin/Int
-              setter: null
-              symbolKind: CLASS_MEMBER
-              typeParameters: []
-              visibility: Public
-            hasDefaultValue: false
-            isCrossinline: false
-            isExtension: false
-            isImplicitLambdaParameter: false
-            isNoinline: false
-            isVararg: false
-            name: constructorProp
-            origin: SOURCE
-            receiverParameter: null
-            returnType: KtUsualClassType:
-              annotationsList: []
-              ownTypeArguments: []
-              type: kotlin/Int
-            symbolKind: LOCAL
-            typeParameters: []
-          KtValueParameterSymbol:
-            annotationsList: []
-            callableIdIfNonLocal: null
-            contextReceivers: []
-            generatedPrimaryConstructorProperty: null
-            hasDefaultValue: false
-            isCrossinline: false
-            isExtension: false
-            isImplicitLambdaParameter: false
-            isNoinline: false
-            isVararg: false
-            name: constructorParam
-            origin: SOURCE
-            receiverParameter: null
-            returnType: KtUsualClassType:
-              annotationsList: []
-              ownTypeArguments: []
-              type: kotlin/Int
-            symbolKind: LOCAL
-            typeParameters: []
-        ]
-        visibility: Public
-
-  ExplicitSimpleImportingScope, index = 2
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 3
-    packages: 0
-    classifiers: 2
-      KtNamedClassOrObjectSymbol:
-        annotationsList: []
-        classIdIfNonLocal: test/Base
-        classKind: CLASS
-        companionObject: null
-        contextReceivers: []
-        isActual: false
-        isData: false
-        isExpect: false
-        isExternal: false
-        isFun: false
-        isInline: false
-        isInner: false
-        modality: OPEN
-        name: Base
-        origin: SOURCE
-        superTypes: [
-          KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Any
-        ]
-        symbolKind: TOP_LEVEL
-        typeParameters: []
-        visibility: Public
-      KtNamedClassOrObjectSymbol:
-        annotationsList: []
-        classIdIfNonLocal: test/Child
-        classKind: CLASS
-        companionObject: null
-        contextReceivers: []
-        isActual: false
-        isData: false
-        isExpect: false
-        isExternal: false
-        isFun: false
-        isInline: false
-        isInner: false
-        modality: FINAL
-        name: Child
-        origin: SOURCE
-        superTypes: [
-          KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: test/Base
-        ]
-        symbolKind: TOP_LEVEL
-        typeParameters: []
-        visibility: Public
-    callables: 0
-    constructors: 0
-
-  DefaultSimpleImportingScope, index = 4
-
-  DefaultSimpleImportingScope, index = 5
-
-  ExplicitStarImportingScope, index = 6
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultStarImportingScope, index = 7
-

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiverWithoutDeclaration.kt

@@ -1,4 +1,4 @@
-
+// IGNORE_FIR
 // FILE: main.kt
 import pkg.A
 

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInImportDirective.kt

@@ -1 +1,2 @@
+// IGNORE_FIR
 import a.b.c.<expr>e</expr>

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInImportDirective.pretty.txt

@@ -1,33 +1,3 @@
 element: e
 implicit receivers:
 scopes:
-  ExplicitSimpleImportingScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 1
-    packages: 6
-      META-INF
-      java
-      javax
-      kotlin
-      org
-      sun
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultSimpleImportingScope, index = 2
-
-  DefaultSimpleImportingScope, index = 3
-
-  ExplicitStarImportingScope, index = 4
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultStarImportingScope, index = 5
-

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInImportDirective.txt

@@ -1,45 +1,3 @@
 element: e
 implicit receivers:
 scopes:
-  ExplicitSimpleImportingScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 1
-    packages: 6
-      KtPackageSymbol:
-        fqName: META-INF
-        origin: SOURCE
-      KtPackageSymbol:
-        fqName: java
-        origin: SOURCE
-      KtPackageSymbol:
-        fqName: javax
-        origin: SOURCE
-      KtPackageSymbol:
-        fqName: kotlin
-        origin: SOURCE
-      KtPackageSymbol:
-        fqName: org
-        origin: SOURCE
-      KtPackageSymbol:
-        fqName: sun
-        origin: SOURCE
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultSimpleImportingScope, index = 2
-
-  DefaultSimpleImportingScope, index = 3
-
-  ExplicitStarImportingScope, index = 4
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultStarImportingScope, index = 5
-

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInPackageDirective.kt

@@ -1 +1,2 @@
+// IGNORE_FIR
 package a.b.c.<expr>e</expr>

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInPackageDirective.pretty.txt

@@ -1,27 +1,3 @@
 element: e
 implicit receivers:
 scopes:
-  ExplicitSimpleImportingScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 1
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultSimpleImportingScope, index = 2
-
-  DefaultSimpleImportingScope, index = 3
-
-  ExplicitStarImportingScope, index = 4
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultStarImportingScope, index = 5
-

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInPackageDirective.txt

@@ -1,27 +1,3 @@
 element: e
 implicit receivers:
 scopes:
-  ExplicitSimpleImportingScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 1
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultSimpleImportingScope, index = 2
-
-  DefaultSimpleImportingScope, index = 3
-
-  ExplicitStarImportingScope, index = 4
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultStarImportingScope, index = 5
-

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/errorType.pretty.txt

@@ -4,13 +4,13 @@ implicit receivers:
   owner symbol: KtFirAnonymousFunctionSymbol
 
 scopes:
-  LocalScope, index = 0
+  TypeScope, index = 0
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  TypeScope, index = 1
+  LocalScope, index = 1
     packages: 0
     classifiers: 0
     callables: 0
@@ -28,19 +28,13 @@ scopes:
     callables: 0
     constructors: 0
 
-  LocalScope, index = 4
+  ExplicitSimpleImportingScope, index = 4
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  ExplicitSimpleImportingScope, index = 5
+  PackageMemberScope, index = 5
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 6
     packages: 6
       META-INF
       java
@@ -53,15 +47,15 @@ scopes:
       fun test()
     constructors: 0
 
+  DefaultSimpleImportingScope, index = 6
+
   DefaultSimpleImportingScope, index = 7
 
-  DefaultSimpleImportingScope, index = 8
+  ExplicitStarImportingScope, index = 8
-
-  ExplicitStarImportingScope, index = 9
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  DefaultStarImportingScope, index = 10
+  DefaultStarImportingScope, index = 9
 

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/errorType.txt

@@ -6,13 +6,13 @@ implicit receivers:
   owner symbol: KtFirAnonymousFunctionSymbol
 
 scopes:
-  LocalScope, index = 0
+  TypeScope, index = 0
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  TypeScope, index = 1
+  LocalScope, index = 1
     packages: 0
     classifiers: 0
     callables: 0
@@ -30,19 +30,13 @@ scopes:
     callables: 0
     constructors: 0
 
-  LocalScope, index = 4
+  ExplicitSimpleImportingScope, index = 4
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  ExplicitSimpleImportingScope, index = 5
+  PackageMemberScope, index = 5
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 6
     packages: 6
       KtPackageSymbol:
         fqName: META-INF
@@ -95,15 +89,15 @@ scopes:
         visibility: Public
     constructors: 0
 
+  DefaultSimpleImportingScope, index = 6
+
   DefaultSimpleImportingScope, index = 7
 
-  DefaultSimpleImportingScope, index = 8
+  ExplicitStarImportingScope, index = 8
-
-  ExplicitStarImportingScope, index = 9
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  DefaultStarImportingScope, index = 10
+  DefaultStarImportingScope, index = 9
 

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/forLoopVariable.pretty.txt

@@ -4,7 +4,8 @@ scopes:
   LocalScope, index = 0
     packages: 0
     classifiers: 0
-    callables: 0
+    callables: 1
+      val loopVar: kotlin.Int
     constructors: 0
 
   LocalScope, index = 1

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/forLoopVariable.txt

@@ -4,7 +4,22 @@ scopes:
   LocalScope, index = 0
     packages: 0
     classifiers: 0
-    callables: 0
+    callables: 1
+      KtLocalVariableSymbol:
+        annotationsList: []
+        callableIdIfNonLocal: null
+        contextReceivers: []
+        isExtension: false
+        isVal: true
+        name: loopVar
+        origin: SOURCE
+        receiverParameter: null
+        returnType: KtUsualClassType:
+          annotationsList: []
+          ownTypeArguments: []
+          type: kotlin/Int
+        symbolKind: LOCAL
+        typeParameters: []
     constructors: 0
 
   LocalScope, index = 1

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocWithoutDeclaration.kt

@@ -1,4 +1,4 @@
-
+// IGNORE_FIR
 // FILE: main.kt
 import pkg.A
 

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/simpleScopeContextForPosition.pretty.txt

@@ -10,13 +10,7 @@ implicit receivers:
   owner symbol: KtFirNamedClassOrObjectSymbol
 
 scopes:
-  LocalScope, index = 0
+  TypeScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  TypeScope, index = 1
     packages: 0
     classifiers: 0
     callables: 4
@@ -27,19 +21,19 @@ scopes:
     constructors: 1
       constructor()
 
+  LocalScope, index = 1
+    packages: 0
+    classifiers: 0
+    callables: 0
+    constructors: 0
+
   LocalScope, index = 2
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  LocalScope, index = 3
+  TypeScope, index = 3
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  TypeScope, index = 4
     packages: 0
     classifiers: 0
     callables: 4
@@ -50,27 +44,27 @@ scopes:
     constructors: 1
       constructor()
 
-  LocalScope, index = 5
+  LocalScope, index = 4
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  LocalScope, index = 6
+  LocalScope, index = 5
     packages: 0
     classifiers: 0
     callables: 1
       val localVarA: kotlin.Int
     constructors: 0
 
-  LocalScope, index = 7
+  LocalScope, index = 6
     packages: 0
     classifiers: 0
     callables: 1
       lambdaArg: kotlin.String
     constructors: 0
 
-  LocalScope, index = 8
+  LocalScope, index = 7
     packages: 0
     classifiers: 0
     callables: 2
@@ -78,21 +72,21 @@ scopes:
       fun localFunB()
     constructors: 0
 
-  LocalScope, index = 9
+  LocalScope, index = 8
     packages: 0
     classifiers: 0
     callables: 1
       param: kotlin.String?
     constructors: 0
 
-  TypeParameterScope, index = 10
+  TypeParameterScope, index = 9
     packages: 0
     classifiers: 1
       T
     callables: 0
     constructors: 0
 
-  TypeScope, index = 11
+  TypeScope, index = 10
     packages: 0
     classifiers: 2
       class NestedInC
@@ -105,27 +99,27 @@ scopes:
     constructors: 1
       constructor()
 
-  StaticMemberScope, index = 12
+  StaticMemberScope, index = 11
     packages: 0
     classifiers: 1
       class NestedInC
     callables: 0
     constructors: 0
 
-  StaticMemberScope, index = 13
+  StaticMemberScope, index = 12
     packages: 0
     classifiers: 1
       class NestedInJavaClass
     callables: 0
     constructors: 0
 
-  ExplicitSimpleImportingScope, index = 14
+  ExplicitSimpleImportingScope, index = 13
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  PackageMemberScope, index = 15
+  PackageMemberScope, index = 14
     packages: 6
       META-INF
       java
@@ -144,15 +138,15 @@ scopes:
       fun topLevel(): kotlin.Int
     constructors: 0
 
+  DefaultSimpleImportingScope, index = 15
+
   DefaultSimpleImportingScope, index = 16
 
-  DefaultSimpleImportingScope, index = 17
+  ExplicitStarImportingScope, index = 17
-
-  ExplicitStarImportingScope, index = 18
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  DefaultStarImportingScope, index = 19
+  DefaultStarImportingScope, index = 18
 

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/simpleScopeContextForPosition.txt

@@ -19,13 +19,7 @@ implicit receivers:
   owner symbol: KtFirNamedClassOrObjectSymbol
 
 scopes:
-  LocalScope, index = 0
+  TypeScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  TypeScope, index = 1
     packages: 0
     classifiers: 0
     callables: 4
@@ -188,19 +182,19 @@ scopes:
         valueParameters: []
         visibility: Public
 
+  LocalScope, index = 1
+    packages: 0
+    classifiers: 0
+    callables: 0
+    constructors: 0
+
   LocalScope, index = 2
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  LocalScope, index = 3
+  TypeScope, index = 3
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  TypeScope, index = 4
     packages: 0
     classifiers: 0
     callables: 4
@@ -363,13 +357,13 @@ scopes:
         valueParameters: []
         visibility: Public
 
-  LocalScope, index = 5
+  LocalScope, index = 4
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  LocalScope, index = 6
+  LocalScope, index = 5
     packages: 0
     classifiers: 0
     callables: 1
@@ -390,7 +384,7 @@ scopes:
         typeParameters: []
     constructors: 0
 
-  LocalScope, index = 7
+  LocalScope, index = 6
     packages: 0
     classifiers: 0
     callables: 1
@@ -416,7 +410,7 @@ scopes:
         typeParameters: []
     constructors: 0
 
-  LocalScope, index = 8
+  LocalScope, index = 7
     packages: 0
     classifiers: 0
     callables: 2
@@ -466,7 +460,7 @@ scopes:
         visibility: Local
     constructors: 0
 
-  LocalScope, index = 9
+  LocalScope, index = 8
     packages: 0
     classifiers: 0
     callables: 1
@@ -492,7 +486,7 @@ scopes:
         typeParameters: []
     constructors: 0
 
-  TypeParameterScope, index = 10
+  TypeParameterScope, index = 9
     packages: 0
     classifiers: 1
       KtTypeParameterSymbol:
@@ -506,7 +500,7 @@ scopes:
     callables: 0
     constructors: 0
 
-  TypeScope, index = 11
+  TypeScope, index = 10
     packages: 0
     classifiers: 2
       KtNamedClassOrObjectSymbol:
@@ -742,7 +736,7 @@ scopes:
         valueParameters: []
         visibility: Public
 
-  StaticMemberScope, index = 12
+  StaticMemberScope, index = 11
     packages: 0
     classifiers: 1
       KtNamedClassOrObjectSymbol:
@@ -773,7 +767,7 @@ scopes:
     callables: 0
     constructors: 0
 
-  StaticMemberScope, index = 13
+  StaticMemberScope, index = 12
     packages: 0
     classifiers: 1
       KtNamedClassOrObjectSymbol:
@@ -804,13 +798,13 @@ scopes:
     callables: 0
     constructors: 0
 
-  ExplicitSimpleImportingScope, index = 14
+  ExplicitSimpleImportingScope, index = 13
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  PackageMemberScope, index = 15
+  PackageMemberScope, index = 14
     packages: 6
       KtPackageSymbol:
         fqName: META-INF
@@ -1115,15 +1109,15 @@ scopes:
         visibility: Public
     constructors: 0
 
+  DefaultSimpleImportingScope, index = 15
+
   DefaultSimpleImportingScope, index = 16
 
-  DefaultSimpleImportingScope, index = 17
+  ExplicitStarImportingScope, index = 17
-
-  ExplicitStarImportingScope, index = 18
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  DefaultStarImportingScope, index = 19
+  DefaultStarImportingScope, index = 18
 

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunction.pretty.txt

@@ -22,13 +22,7 @@ scopes:
     callables: 0
     constructors: 0
 
-  LocalScope, index = 3
+  TypeScope, index = 3
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  TypeScope, index = 4
     packages: 0
     classifiers: 0
     callables: 3
@@ -38,19 +32,19 @@ scopes:
     constructors: 1
       constructor()
 
-  LocalScope, index = 5
+  LocalScope, index = 4
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  ExplicitSimpleImportingScope, index = 6
+  ExplicitSimpleImportingScope, index = 5
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  PackageMemberScope, index = 7
+  PackageMemberScope, index = 6
     packages: 6
       META-INF
       java
@@ -64,15 +58,15 @@ scopes:
       fun kotlin.Any.test(): () -> kotlin.Int
     constructors: 0
 
+  DefaultSimpleImportingScope, index = 7
+
   DefaultSimpleImportingScope, index = 8
 
-  DefaultSimpleImportingScope, index = 9
+  ExplicitStarImportingScope, index = 9
-
-  ExplicitStarImportingScope, index = 10
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  DefaultStarImportingScope, index = 11
+  DefaultStarImportingScope, index = 10
 

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunction.txt

@@ -25,13 +25,7 @@ scopes:
     callables: 0
     constructors: 0
 
-  LocalScope, index = 3
+  TypeScope, index = 3
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  TypeScope, index = 4
     packages: 0
     classifiers: 0
     callables: 3
@@ -165,19 +159,19 @@ scopes:
         valueParameters: []
         visibility: Public
 
-  LocalScope, index = 5
+  LocalScope, index = 4
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  ExplicitSimpleImportingScope, index = 6
+  ExplicitSimpleImportingScope, index = 5
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  PackageMemberScope, index = 7
+  PackageMemberScope, index = 6
     packages: 6
       KtPackageSymbol:
         fqName: META-INF
@@ -267,15 +261,15 @@ scopes:
         visibility: Public
     constructors: 0
 
+  DefaultSimpleImportingScope, index = 7
+
   DefaultSimpleImportingScope, index = 8
 
-  DefaultSimpleImportingScope, index = 9
+  ExplicitStarImportingScope, index = 9
-
-  ExplicitStarImportingScope, index = 10
     packages: 0
     classifiers: 0
     callables: 0
     constructors: 0
 
-  DefaultStarImportingScope, index = 11
+  DefaultStarImportingScope, index = 10
 

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor.kt

@@ -1,11 +0,0 @@
-package test
-
-open class Base(val value: Int) {
-    fun baseMember(): Int = value
-    val baseProp: Int = value
-}
-
-class Child : Base(<expr>10</expr>) {
-    fun childMember(): Int = value
-    val childProp: Int = value
-}

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor.pretty.txt

@@ -1,35 +0,0 @@
-element: 10
-implicit receivers:
-scopes:
-  LocalScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  ExplicitSimpleImportingScope, index = 1
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 2
-    packages: 0
-    classifiers: 2
-      class Base(value: kotlin.Int)
-      class Child : test.Base()
-    callables: 0
-    constructors: 0
-
-  DefaultSimpleImportingScope, index = 3
-
-  DefaultSimpleImportingScope, index = 4
-
-  ExplicitStarImportingScope, index = 5
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultStarImportingScope, index = 6
-

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor.txt

@@ -1,83 +0,0 @@
-element: 10
-implicit receivers:
-scopes:
-  LocalScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  ExplicitSimpleImportingScope, index = 1
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 2
-    packages: 0
-    classifiers: 2
-      KtNamedClassOrObjectSymbol:
-        annotationsList: []
-        classIdIfNonLocal: test/Base
-        classKind: CLASS
-        companionObject: null
-        contextReceivers: []
-        isActual: false
-        isData: false
-        isExpect: false
-        isExternal: false
-        isFun: false
-        isInline: false
-        isInner: false
-        modality: OPEN
-        name: Base
-        origin: SOURCE
-        superTypes: [
-          KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Any
-        ]
-        symbolKind: TOP_LEVEL
-        typeParameters: []
-        visibility: Public
-      KtNamedClassOrObjectSymbol:
-        annotationsList: []
-        classIdIfNonLocal: test/Child
-        classKind: CLASS
-        companionObject: null
-        contextReceivers: []
-        isActual: false
-        isData: false
-        isExpect: false
-        isExternal: false
-        isFun: false
-        isInline: false
-        isInner: false
-        modality: FINAL
-        name: Child
-        origin: SOURCE
-        superTypes: [
-          KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: test/Base
-        ]
-        symbolKind: TOP_LEVEL
-        typeParameters: []
-        visibility: Public
-    callables: 0
-    constructors: 0
-
-  DefaultSimpleImportingScope, index = 3
-
-  DefaultSimpleImportingScope, index = 4
-
-  ExplicitStarImportingScope, index = 5
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultStarImportingScope, index = 6
-

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_lambda.kt

@@ -1,15 +0,0 @@
-package test
-
-class Receiver {
-    fun fromReceiver() {}
-}
-
-open class Base(val value: Receiver.() -> Unit) {
-    fun baseMember(): Int = 10
-    val baseProp: Int = 10
-}
-
-class Child : Base({ <expr>this</expr> }) {
-    fun childMember(): Int = 10
-    val childProp: Int = 10
-}

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_lambda.pretty.txt

@@ -1,62 +0,0 @@
-element: this
-implicit receivers:
-  type: test.Receiver
-  owner symbol: KtFirAnonymousFunctionSymbol
-
-scopes:
-  LocalScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  TypeScope, index = 1
-    packages: 0
-    classifiers: 0
-    callables: 4
-      fun fromReceiver()
-      fun equals(other: kotlin.Any?): kotlin.Boolean
-      fun hashCode(): kotlin.Int
-      fun toString(): kotlin.String
-    constructors: 1
-      constructor()
-
-  LocalScope, index = 2
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  LocalScope, index = 3
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  ExplicitSimpleImportingScope, index = 4
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 5
-    packages: 0
-    classifiers: 3
-      class Receiver
-      class Base(value: test.Receiver.() -> kotlin.Unit)
-      class Child : test.Base()
-    callables: 0
-    constructors: 0
-
-  DefaultSimpleImportingScope, index = 6
-
-  DefaultSimpleImportingScope, index = 7
-
-  ExplicitStarImportingScope, index = 8
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultStarImportingScope, index = 9
-

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_lambda.txt

@@ -1,289 +0,0 @@
-element: this
-implicit receivers:
-  type: KtUsualClassType:
-    annotationsList: []
-    ownTypeArguments: []
-    type: test/Receiver
-  owner symbol: KtFirAnonymousFunctionSymbol
-
-scopes:
-  LocalScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  TypeScope, index = 1
-    packages: 0
-    classifiers: 0
-    callables: 4
-      KtFunctionSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: test/Receiver.fromReceiver
-        contextReceivers: []
-        contractEffects: []
-        hasStableParameterNames: true
-        isActual: false
-        isBuiltinFunctionInvoke: false
-        isExpect: false
-        isExtension: false
-        isExternal: false
-        isInfix: false
-        isInline: false
-        isOperator: false
-        isOverride: false
-        isStatic: false
-        isSuspend: false
-        modality: FINAL
-        name: fromReceiver
-        origin: SOURCE
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Unit
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        valueParameters: []
-        visibility: Public
-      KtFunctionSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: kotlin/Any.equals
-        contextReceivers: []
-        contractEffects: []
-        hasStableParameterNames: true
-        isActual: false
-        isBuiltinFunctionInvoke: false
-        isExpect: false
-        isExtension: false
-        isExternal: false
-        isInfix: false
-        isInline: false
-        isOperator: true
-        isOverride: false
-        isStatic: false
-        isSuspend: false
-        modality: OPEN
-        name: equals
-        origin: LIBRARY
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Boolean
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        valueParameters: [
-          KtValueParameterSymbol:
-            annotationsList: []
-            callableIdIfNonLocal: null
-            contextReceivers: []
-            generatedPrimaryConstructorProperty: null
-            hasDefaultValue: false
-            isCrossinline: false
-            isExtension: false
-            isImplicitLambdaParameter: false
-            isNoinline: false
-            isVararg: false
-            name: other
-            origin: LIBRARY
-            receiverParameter: null
-            returnType: KtUsualClassType:
-              annotationsList: []
-              ownTypeArguments: []
-              type: kotlin/Any?
-            symbolKind: LOCAL
-            typeParameters: []
-        ]
-        visibility: Public
-      KtFunctionSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: kotlin/Any.hashCode
-        contextReceivers: []
-        contractEffects: []
-        hasStableParameterNames: true
-        isActual: false
-        isBuiltinFunctionInvoke: false
-        isExpect: false
-        isExtension: false
-        isExternal: false
-        isInfix: false
-        isInline: false
-        isOperator: false
-        isOverride: false
-        isStatic: false
-        isSuspend: false
-        modality: OPEN
-        name: hashCode
-        origin: LIBRARY
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Int
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        valueParameters: []
-        visibility: Public
-      KtFunctionSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: kotlin/Any.toString
-        contextReceivers: []
-        contractEffects: []
-        hasStableParameterNames: true
-        isActual: false
-        isBuiltinFunctionInvoke: false
-        isExpect: false
-        isExtension: false
-        isExternal: false
-        isInfix: false
-        isInline: false
-        isOperator: false
-        isOverride: false
-        isStatic: false
-        isSuspend: false
-        modality: OPEN
-        name: toString
-        origin: LIBRARY
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/String
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        valueParameters: []
-        visibility: Public
-    constructors: 1
-      KtConstructorSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: null
-        containingClassIdIfNonLocal: test/Receiver
-        contextReceivers: []
-        hasStableParameterNames: true
-        isActual: false
-        isExpect: false
-        isExtension: false
-        isPrimary: true
-        origin: SOURCE_MEMBER_GENERATED
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: test/Receiver
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        valueParameters: []
-        visibility: Public
-
-  LocalScope, index = 2
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  LocalScope, index = 3
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  ExplicitSimpleImportingScope, index = 4
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 5
-    packages: 0
-    classifiers: 3
-      KtNamedClassOrObjectSymbol:
-        annotationsList: []
-        classIdIfNonLocal: test/Receiver
-        classKind: CLASS
-        companionObject: null
-        contextReceivers: []
-        isActual: false
-        isData: false
-        isExpect: false
-        isExternal: false
-        isFun: false
-        isInline: false
-        isInner: false
-        modality: FINAL
-        name: Receiver
-        origin: SOURCE
-        superTypes: [
-          KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Any
-        ]
-        symbolKind: TOP_LEVEL
-        typeParameters: []
-        visibility: Public
-      KtNamedClassOrObjectSymbol:
-        annotationsList: []
-        classIdIfNonLocal: test/Base
-        classKind: CLASS
-        companionObject: null
-        contextReceivers: []
-        isActual: false
-        isData: false
-        isExpect: false
-        isExternal: false
-        isFun: false
-        isInline: false
-        isInner: false
-        modality: OPEN
-        name: Base
-        origin: SOURCE
-        superTypes: [
-          KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Any
-        ]
-        symbolKind: TOP_LEVEL
-        typeParameters: []
-        visibility: Public
-      KtNamedClassOrObjectSymbol:
-        annotationsList: []
-        classIdIfNonLocal: test/Child
-        classKind: CLASS
-        companionObject: null
-        contextReceivers: []
-        isActual: false
-        isData: false
-        isExpect: false
-        isExternal: false
-        isFun: false
-        isInline: false
-        isInner: false
-        modality: FINAL
-        name: Child
-        origin: SOURCE
-        superTypes: [
-          KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: test/Base
-        ]
-        symbolKind: TOP_LEVEL
-        typeParameters: []
-        visibility: Public
-    callables: 0
-    constructors: 0
-
-  DefaultSimpleImportingScope, index = 6
-
-  DefaultSimpleImportingScope, index = 7
-
-  ExplicitStarImportingScope, index = 8
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultStarImportingScope, index = 9
-

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses.kt

@@ -1,12 +0,0 @@
-package test
-
-interface BaseInterface {
-    class NestedFromInterface
-}
-
-open class Base(any: Any): BaseInterface {
-    class NestedFromClass
-    inner class InnerFromClass
-}
-
-class Child : Base(<expr>Base.NestedFromClass()</expr>)

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses.pretty.txt

@@ -1,44 +0,0 @@
-element: Base.NestedFromClass()
-implicit receivers:
-scopes:
-  LocalScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  StaticMemberScope, index = 1
-    packages: 0
-    classifiers: 2
-      class NestedFromClass
-      class InnerFromClass
-    callables: 0
-    constructors: 0
-
-  ExplicitSimpleImportingScope, index = 2
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 3
-    packages: 0
-    classifiers: 3
-      interface BaseInterface
-      class Base(any: kotlin.Any) : test.BaseInterface
-      class Child : test.Base()
-    callables: 0
-    constructors: 0
-
-  DefaultSimpleImportingScope, index = 4
-
-  DefaultSimpleImportingScope, index = 5
-
-  ExplicitStarImportingScope, index = 6
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultStarImportingScope, index = 7
-

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses.txt

@@ -1,164 +0,0 @@
-element: Base.NestedFromClass()
-implicit receivers:
-scopes:
-  LocalScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  StaticMemberScope, index = 1
-    packages: 0
-    classifiers: 2
-      KtNamedClassOrObjectSymbol:
-        annotationsList: []
-        classIdIfNonLocal: test/Base.NestedFromClass
-        classKind: CLASS
-        companionObject: null
-        contextReceivers: []
-        isActual: false
-        isData: false
-        isExpect: false
-        isExternal: false
-        isFun: false
-        isInline: false
-        isInner: false
-        modality: FINAL
-        name: NestedFromClass
-        origin: SOURCE
-        superTypes: [
-          KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Any
-        ]
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
-      KtNamedClassOrObjectSymbol:
-        annotationsList: []
-        classIdIfNonLocal: test/Base.InnerFromClass
-        classKind: CLASS
-        companionObject: null
-        contextReceivers: []
-        isActual: false
-        isData: false
-        isExpect: false
-        isExternal: false
-        isFun: false
-        isInline: false
-        isInner: true
-        modality: FINAL
-        name: InnerFromClass
-        origin: SOURCE
-        superTypes: [
-          KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Any
-        ]
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
-    callables: 0
-    constructors: 0
-
-  ExplicitSimpleImportingScope, index = 2
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 3
-    packages: 0
-    classifiers: 3
-      KtNamedClassOrObjectSymbol:
-        annotationsList: []
-        classIdIfNonLocal: test/BaseInterface
-        classKind: INTERFACE
-        companionObject: null
-        contextReceivers: []
-        isActual: false
-        isData: false
-        isExpect: false
-        isExternal: false
-        isFun: false
-        isInline: false
-        isInner: false
-        modality: ABSTRACT
-        name: BaseInterface
-        origin: SOURCE
-        superTypes: [
-          KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Any
-        ]
-        symbolKind: TOP_LEVEL
-        typeParameters: []
-        visibility: Public
-      KtNamedClassOrObjectSymbol:
-        annotationsList: []
-        classIdIfNonLocal: test/Base
-        classKind: CLASS
-        companionObject: null
-        contextReceivers: []
-        isActual: false
-        isData: false
-        isExpect: false
-        isExternal: false
-        isFun: false
-        isInline: false
-        isInner: false
-        modality: OPEN
-        name: Base
-        origin: SOURCE
-        superTypes: [
-          KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: test/BaseInterface
-        ]
-        symbolKind: TOP_LEVEL
-        typeParameters: []
-        visibility: Public
-      KtNamedClassOrObjectSymbol:
-        annotationsList: []
-        classIdIfNonLocal: test/Child
-        classKind: CLASS
-        companionObject: null
-        contextReceivers: []
-        isActual: false
-        isData: false
-        isExpect: false
-        isExternal: false
-        isFun: false
-        isInline: false
-        isInner: false
-        modality: FINAL
-        name: Child
-        origin: SOURCE
-        superTypes: [
-          KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: test/Base
-        ]
-        symbolKind: TOP_LEVEL
-        typeParameters: []
-        visibility: Public
-    callables: 0
-    constructors: 0
-
-  DefaultSimpleImportingScope, index = 4
-
-  DefaultSimpleImportingScope, index = 5
-
-  ExplicitStarImportingScope, index = 6
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultStarImportingScope, index = 7
-

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses_typeArgument.kt

@@ -1,12 +0,0 @@
-package test
-
-interface BaseInterface {
-    class NestedFromInterface
-}
-
-open class Base<T> : BaseInterface {
-    class NestedFromClass
-    inner class InnerFromClass
-}
-
-class Child : Base<<expr>Base.NestedFromClass</expr>>()

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses_typeArgument.pretty.txt

@@ -1,30 +0,0 @@
-element: Base.NestedFromClass
-implicit receivers:
-scopes:
-  ExplicitSimpleImportingScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 1
-    packages: 0
-    classifiers: 3
-      interface BaseInterface
-      class Base<T> : test.BaseInterface
-      class Child : test.Base<test.Base.NestedFromClass>()
-    callables: 0
-    constructors: 0
-
-  DefaultSimpleImportingScope, index = 2
-
-  DefaultSimpleImportingScope, index = 3
-
-  ExplicitStarImportingScope, index = 4
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultStarImportingScope, index = 5
-

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses_typeArgument.txt

@@ -1,109 +0,0 @@
-element: Base.NestedFromClass
-implicit receivers:
-scopes:
-  ExplicitSimpleImportingScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 1
-    packages: 0
-    classifiers: 3
-      KtNamedClassOrObjectSymbol:
-        annotationsList: []
-        classIdIfNonLocal: test/BaseInterface
-        classKind: INTERFACE
-        companionObject: null
-        contextReceivers: []
-        isActual: false
-        isData: false
-        isExpect: false
-        isExternal: false
-        isFun: false
-        isInline: false
-        isInner: false
-        modality: ABSTRACT
-        name: BaseInterface
-        origin: SOURCE
-        superTypes: [
-          KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Any
-        ]
-        symbolKind: TOP_LEVEL
-        typeParameters: []
-        visibility: Public
-      KtNamedClassOrObjectSymbol:
-        annotationsList: []
-        classIdIfNonLocal: test/Base
-        classKind: CLASS
-        companionObject: null
-        contextReceivers: []
-        isActual: false
-        isData: false
-        isExpect: false
-        isExternal: false
-        isFun: false
-        isInline: false
-        isInner: false
-        modality: OPEN
-        name: Base
-        origin: SOURCE
-        superTypes: [
-          KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: test/BaseInterface
-        ]
-        symbolKind: TOP_LEVEL
-        typeParameters: [
-          KtTypeParameterSymbol(T)
-        ]
-        visibility: Public
-      KtNamedClassOrObjectSymbol:
-        annotationsList: []
-        classIdIfNonLocal: test/Child
-        classKind: CLASS
-        companionObject: null
-        contextReceivers: []
-        isActual: false
-        isData: false
-        isExpect: false
-        isExternal: false
-        isFun: false
-        isInline: false
-        isInner: false
-        modality: FINAL
-        name: Child
-        origin: SOURCE
-        superTypes: [
-          KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: [
-              KtUsualClassType:
-                annotationsList: []
-                ownTypeArguments: []
-                type: test/Base.NestedFromClass
-            ]
-            type: test/Base<test/Base.NestedFromClass>
-        ]
-        symbolKind: TOP_LEVEL
-        typeParameters: []
-        visibility: Public
-    callables: 0
-    constructors: 0
-
-  DefaultSimpleImportingScope, index = 2
-
-  DefaultSimpleImportingScope, index = 3
-
-  ExplicitStarImportingScope, index = 4
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultStarImportingScope, index = 5
-

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeDelegate.kt

@@ -1,11 +0,0 @@
-package test
-
-interface Base {
-    fun baseMember(): Int = 10
-    val baseProp: Int = 10
-}
-
-class Child(base: Base) : Base by <expr>base</expr> {
-    fun childMember(): Int = 10
-    val childProp: Int = 10
-}

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeDelegate.pretty.txt

@@ -1,36 +0,0 @@
-element: base
-implicit receivers:
-scopes:
-  LocalScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 1
-      base: test.Base
-    constructors: 0
-
-  ExplicitSimpleImportingScope, index = 1
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 2
-    packages: 0
-    classifiers: 2
-      interface Base
-      class Child(base: test.Base) : test.Base
-    callables: 0
-    constructors: 0
-
-  DefaultSimpleImportingScope, index = 3
-
-  DefaultSimpleImportingScope, index = 4
-
-  ExplicitStarImportingScope, index = 5
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultStarImportingScope, index = 6
-

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeDelegate.txt

@@ -1,103 +0,0 @@
-element: base
-implicit receivers:
-scopes:
-  LocalScope, index = 0
-    packages: 0
-    classifiers: 0
-    callables: 1
-      KtValueParameterSymbol:
-        annotationsList: []
-        callableIdIfNonLocal: null
-        contextReceivers: []
-        generatedPrimaryConstructorProperty: null
-        hasDefaultValue: false
-        isCrossinline: false
-        isExtension: false
-        isImplicitLambdaParameter: false
-        isNoinline: false
-        isVararg: false
-        name: base
-        origin: SOURCE
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: test/Base
-        symbolKind: LOCAL
-        typeParameters: []
-    constructors: 0
-
-  ExplicitSimpleImportingScope, index = 1
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  PackageMemberScope, index = 2
-    packages: 0
-    classifiers: 2
-      KtNamedClassOrObjectSymbol:
-        annotationsList: []
-        classIdIfNonLocal: test/Base
-        classKind: INTERFACE
-        companionObject: null
-        contextReceivers: []
-        isActual: false
-        isData: false
-        isExpect: false
-        isExternal: false
-        isFun: false
-        isInline: false
-        isInner: false
-        modality: ABSTRACT
-        name: Base
-        origin: SOURCE
-        superTypes: [
-          KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: kotlin/Any
-        ]
-        symbolKind: TOP_LEVEL
-        typeParameters: []
-        visibility: Public
-      KtNamedClassOrObjectSymbol:
-        annotationsList: []
-        classIdIfNonLocal: test/Child
-        classKind: CLASS
-        companionObject: null
-        contextReceivers: []
-        isActual: false
-        isData: false
-        isExpect: false
-        isExternal: false
-        isFun: false
-        isInline: false
-        isInner: false
-        modality: FINAL
-        name: Child
-        origin: SOURCE
-        superTypes: [
-          KtUsualClassType:
-            annotationsList: []
-            ownTypeArguments: []
-            type: test/Base
-        ]
-        symbolKind: TOP_LEVEL
-        typeParameters: []
-        visibility: Public
-    callables: 0
-    constructors: 0
-
-  DefaultSimpleImportingScope, index = 3
-
-  DefaultSimpleImportingScope, index = 4
-
-  ExplicitStarImportingScope, index = 5
-    packages: 0
-    classifiers: 0
-    callables: 0
-    constructors: 0
-
-  DefaultStarImportingScope, index = 6
-