diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt index 6bd988ea0e8..1fc77eefd58 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt @@ -6,21 +6,25 @@ package org.jetbrains.kotlin.analysis.api.symbols import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.resolve.deprecation.DeprecationInfo import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.KtConstantInitializerValue import org.jetbrains.kotlin.analysis.api.KtInitializerValue import org.jetbrains.kotlin.analysis.api.KtNonConstantInitializerValue import org.jetbrains.kotlin.analysis.api.annotations.* import org.jetbrains.kotlin.analysis.api.components.KtSymbolInfoProviderMixIn -import org.jetbrains.kotlin.analysis.api.symbols.markers.* +import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol +import org.jetbrains.kotlin.analysis.api.symbols.markers.KtPossiblyNamedSymbol import org.jetbrains.kotlin.analysis.api.types.KtClassErrorType import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.utils.printer.PrettyPrinter import org.jetbrains.kotlin.analysis.utils.printer.prettyPrint import org.jetbrains.kotlin.descriptors.Visibility -import org.jetbrains.kotlin.name.* +import org.jetbrains.kotlin.name.ClassId +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.name.SpecialNames import org.jetbrains.kotlin.renderer.render +import org.jetbrains.kotlin.resolve.deprecation.DeprecationInfo import java.lang.reflect.InvocationTargetException import kotlin.reflect.KClass import kotlin.reflect.KProperty @@ -63,14 +67,8 @@ public object DebugSymbolRenderer { renderProperty(KtNamedSymbol::name, symbol) } renderProperty(KtCallableSymbol::origin, symbol) - - @Suppress("DEPRECATION") - (symbol as? KtCallableSymbol)?.getDispatchReceiverType()?.let { dispatchType -> - appendLine().append("getDispatchReceiver()").append(": ") - renderType(dispatchType) - } } - }.toString() + } private fun PrettyPrinter.renderProperty(property: KProperty<*>, vararg args: Any) { try { diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.descriptors.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.descriptors.txt index 78ed82b506e..001a499e090 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.descriptors.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.descriptors.txt @@ -2,40 +2,33 @@ KtFunctionSymbol: callableIdIfNonLocal: test/Base.noGeneric name: noGeneric origin: LIBRARY - getDispatchReceiver(): test/Base KtFunctionSymbol: callableIdIfNonLocal: test/ClassWithGenericBase.withOuterGeneric name: withOuterGeneric origin: SOURCE - getDispatchReceiver(): test/Base KtFunctionSymbol: callableIdIfNonLocal: test/Base.withOwnGeneric name: withOwnGeneric origin: LIBRARY - getDispatchReceiver(): test/Base KtFunctionSymbol: callableIdIfNonLocal: test/ClassWithGenericBase.withOuterAndOwnGeneric name: withOuterAndOwnGeneric origin: SOURCE - getDispatchReceiver(): test/Base KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString - origin: LIBRARY - getDispatchReceiver(): kotlin/Any \ No newline at end of file + origin: LIBRARY \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.txt index 6160c1af57c..ac64eaf6bf7 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.txt @@ -2,44 +2,37 @@ KtFunctionSymbol: callableIdIfNonLocal: test/Base.noGeneric name: noGeneric origin: SOURCE - getDispatchReceiver(): test/Base KtFunctionSymbol: callableIdIfNonLocal: test/ClassWithGenericBase.withOuterGeneric name: withOuterGeneric origin: SOURCE - getDispatchReceiver(): test/ClassWithGenericBase KtFunctionSymbol: callableIdIfNonLocal: test/Base.withOwnGeneric name: withOwnGeneric origin: SOURCE - getDispatchReceiver(): test/Base KtFunctionSymbol: callableIdIfNonLocal: test/ClassWithGenericBase.withOuterAndOwnGeneric name: withOuterAndOwnGeneric origin: SOURCE - getDispatchReceiver(): test/ClassWithGenericBase KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtConstructorSymbol: callableIdIfNonLocal: null - origin: SOURCE_MEMBER_GENERATED + origin: SOURCE_MEMBER_GENERATED \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.descriptors.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.descriptors.txt index 56f37604f0c..201ff7e07c2 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.descriptors.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.descriptors.txt @@ -2,40 +2,33 @@ KtKotlinPropertySymbol: callableIdIfNonLocal: test/Base.noGeneric name: noGeneric origin: LIBRARY - getDispatchReceiver(): test/Base KtKotlinPropertySymbol: callableIdIfNonLocal: test/ClassWithGenericBase.withOuterGeneric name: withOuterGeneric origin: SOURCE - getDispatchReceiver(): test/Base KtKotlinPropertySymbol: callableIdIfNonLocal: test/Base.withOwnGeneric name: withOwnGeneric origin: LIBRARY - getDispatchReceiver(): test/Base KtKotlinPropertySymbol: callableIdIfNonLocal: test/ClassWithGenericBase.withOuterAndOwnGeneric name: withOuterAndOwnGeneric origin: SOURCE - getDispatchReceiver(): test/Base KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString - origin: LIBRARY - getDispatchReceiver(): kotlin/Any \ No newline at end of file + origin: LIBRARY \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.txt index 694c5fe763a..c03ff79bfac 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.txt @@ -2,44 +2,37 @@ KtKotlinPropertySymbol: callableIdIfNonLocal: test/Base.noGeneric name: noGeneric origin: SOURCE - getDispatchReceiver(): test/Base KtKotlinPropertySymbol: callableIdIfNonLocal: test/ClassWithGenericBase.withOuterGeneric name: withOuterGeneric origin: SOURCE - getDispatchReceiver(): test/ClassWithGenericBase KtKotlinPropertySymbol: callableIdIfNonLocal: test/Base.withOwnGeneric name: withOwnGeneric origin: SOURCE - getDispatchReceiver(): test/Base KtKotlinPropertySymbol: callableIdIfNonLocal: test/ClassWithGenericBase.withOuterAndOwnGeneric name: withOuterAndOwnGeneric origin: SOURCE - getDispatchReceiver(): test/ClassWithGenericBase KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtConstructorSymbol: callableIdIfNonLocal: null - origin: SOURCE_MEMBER_GENERATED + origin: SOURCE_MEMBER_GENERATED \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.descriptors.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.descriptors.txt index 4834a2b2d38..08ed781f1eb 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.descriptors.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.descriptors.txt @@ -2,46 +2,38 @@ KtFunctionSymbol: callableIdIfNonLocal: test/InterfaceWithFun.noGenerics_InterfaceWithFun name: noGenerics_InterfaceWithFun origin: LIBRARY - getDispatchReceiver(): test/InterfaceWithFun KtFunctionSymbol: callableIdIfNonLocal: test/ClassWithInterfaceWithFun.withOuterGeneric_InterfaceWithFun name: withOuterGeneric_InterfaceWithFun origin: SOURCE - getDispatchReceiver(): test/InterfaceWithFun KtFunctionSymbol: callableIdIfNonLocal: test/InterfaceWithFunBase.noGenerics_InterfaceWithFunBase name: noGenerics_InterfaceWithFunBase origin: LIBRARY - getDispatchReceiver(): test/InterfaceWithFunBase KtFunctionSymbol: callableIdIfNonLocal: test/InterfaceWithFun.withOuterGenericT1_InterfaceWithFunBase name: withOuterGenericT1_InterfaceWithFunBase origin: SOURCE - getDispatchReceiver(): test/InterfaceWithFunBase KtFunctionSymbol: callableIdIfNonLocal: test/ClassWithInterfaceWithFun.withOuterGenericT2_InterfaceWithFunBase name: withOuterGenericT2_InterfaceWithFunBase origin: SOURCE - getDispatchReceiver(): test/InterfaceWithFunBase KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString - origin: LIBRARY - getDispatchReceiver(): kotlin/Any \ No newline at end of file + origin: LIBRARY \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.txt index 6cf23e29de4..f34317a9dea 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.txt @@ -2,50 +2,42 @@ KtFunctionSymbol: callableIdIfNonLocal: test/InterfaceWithFun.noGenerics_InterfaceWithFun name: noGenerics_InterfaceWithFun origin: SOURCE - getDispatchReceiver(): test/InterfaceWithFun KtFunctionSymbol: callableIdIfNonLocal: test/ClassWithInterfaceWithFun.withOuterGeneric_InterfaceWithFun name: withOuterGeneric_InterfaceWithFun origin: SOURCE - getDispatchReceiver(): test/ClassWithInterfaceWithFun KtFunctionSymbol: callableIdIfNonLocal: test/InterfaceWithFunBase.noGenerics_InterfaceWithFunBase name: noGenerics_InterfaceWithFunBase origin: SOURCE - getDispatchReceiver(): test/InterfaceWithFunBase KtFunctionSymbol: callableIdIfNonLocal: test/InterfaceWithFun.withOuterGenericT1_InterfaceWithFunBase name: withOuterGenericT1_InterfaceWithFunBase origin: SOURCE - getDispatchReceiver(): test/InterfaceWithFun KtFunctionSymbol: callableIdIfNonLocal: test/ClassWithInterfaceWithFun.withOuterGenericT2_InterfaceWithFunBase name: withOuterGenericT2_InterfaceWithFunBase origin: SOURCE - getDispatchReceiver(): test/ClassWithInterfaceWithFun KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtConstructorSymbol: callableIdIfNonLocal: null - origin: SOURCE_MEMBER_GENERATED + origin: SOURCE_MEMBER_GENERATED \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.descriptors.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.descriptors.txt index f407717fd74..0b2ea4672bd 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.descriptors.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.descriptors.txt @@ -2,76 +2,63 @@ KtKotlinPropertySymbol: callableIdIfNonLocal: test/InterfaceWithVal.noGenerics_InterfaceWithVal name: noGenerics_InterfaceWithVal origin: LIBRARY - getDispatchReceiver(): test/InterfaceWithVal KtKotlinPropertySymbol: callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOuterGeneric_InterfaceWithVal name: withOuterGeneric_InterfaceWithVal origin: SOURCE - getDispatchReceiver(): test/InterfaceWithVal KtKotlinPropertySymbol: callableIdIfNonLocal: test/InterfaceWithVal.withOwnGeneric_InterfaceWithVal name: withOwnGeneric_InterfaceWithVal origin: LIBRARY - getDispatchReceiver(): test/InterfaceWithVal KtKotlinPropertySymbol: callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOwnAndOuterGeneric_InterfaceWithVal name: withOwnAndOuterGeneric_InterfaceWithVal origin: SOURCE - getDispatchReceiver(): test/InterfaceWithVal KtKotlinPropertySymbol: callableIdIfNonLocal: test/InterfaceWithValBase.noGenerics_InterfaceWithValBase name: noGenerics_InterfaceWithValBase origin: LIBRARY - getDispatchReceiver(): test/InterfaceWithValBase KtKotlinPropertySymbol: callableIdIfNonLocal: test/InterfaceWithVal.withOuterGenericT1_InterfaceWithValBase name: withOuterGenericT1_InterfaceWithValBase origin: SOURCE - getDispatchReceiver(): test/InterfaceWithValBase KtKotlinPropertySymbol: callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOuterGenericT2_InterfaceWithValBase name: withOuterGenericT2_InterfaceWithValBase origin: SOURCE - getDispatchReceiver(): test/InterfaceWithValBase KtKotlinPropertySymbol: callableIdIfNonLocal: test/InterfaceWithValBase.withOwnGeneric_InterfaceWithValBase name: withOwnGeneric_InterfaceWithValBase origin: LIBRARY - getDispatchReceiver(): test/InterfaceWithValBase KtKotlinPropertySymbol: callableIdIfNonLocal: test/InterfaceWithVal.withOwnAndOuterGenericT1_InterfaceWithValBase name: withOwnAndOuterGenericT1_InterfaceWithValBase origin: SOURCE - getDispatchReceiver(): test/InterfaceWithValBase KtKotlinPropertySymbol: callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOwnAndOuterGenericT2_InterfaceWithValBase name: withOwnAndOuterGenericT2_InterfaceWithValBase origin: SOURCE - getDispatchReceiver(): test/InterfaceWithValBase KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString - origin: LIBRARY - getDispatchReceiver(): kotlin/Any \ No newline at end of file + origin: LIBRARY \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.txt index 21f236b3e2f..f543a1af385 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.txt @@ -2,80 +2,67 @@ KtKotlinPropertySymbol: callableIdIfNonLocal: test/InterfaceWithVal.noGenerics_InterfaceWithVal name: noGenerics_InterfaceWithVal origin: SOURCE - getDispatchReceiver(): test/InterfaceWithVal KtKotlinPropertySymbol: callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOuterGeneric_InterfaceWithVal name: withOuterGeneric_InterfaceWithVal origin: SOURCE - getDispatchReceiver(): test/ClassWithInterfaceWithVal KtKotlinPropertySymbol: callableIdIfNonLocal: test/InterfaceWithVal.withOwnGeneric_InterfaceWithVal name: withOwnGeneric_InterfaceWithVal origin: SOURCE - getDispatchReceiver(): test/InterfaceWithVal KtKotlinPropertySymbol: callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOwnAndOuterGeneric_InterfaceWithVal name: withOwnAndOuterGeneric_InterfaceWithVal origin: SOURCE - getDispatchReceiver(): test/ClassWithInterfaceWithVal KtKotlinPropertySymbol: callableIdIfNonLocal: test/InterfaceWithValBase.noGenerics_InterfaceWithValBase name: noGenerics_InterfaceWithValBase origin: SOURCE - getDispatchReceiver(): test/InterfaceWithValBase KtKotlinPropertySymbol: callableIdIfNonLocal: test/InterfaceWithVal.withOuterGenericT1_InterfaceWithValBase name: withOuterGenericT1_InterfaceWithValBase origin: SOURCE - getDispatchReceiver(): test/InterfaceWithVal KtKotlinPropertySymbol: callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOuterGenericT2_InterfaceWithValBase name: withOuterGenericT2_InterfaceWithValBase origin: SOURCE - getDispatchReceiver(): test/ClassWithInterfaceWithVal KtKotlinPropertySymbol: callableIdIfNonLocal: test/InterfaceWithValBase.withOwnGeneric_InterfaceWithValBase name: withOwnGeneric_InterfaceWithValBase origin: SOURCE - getDispatchReceiver(): test/InterfaceWithValBase KtKotlinPropertySymbol: callableIdIfNonLocal: test/InterfaceWithVal.withOwnAndOuterGenericT1_InterfaceWithValBase name: withOwnAndOuterGenericT1_InterfaceWithValBase origin: SOURCE - getDispatchReceiver(): test/InterfaceWithVal KtKotlinPropertySymbol: callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOwnAndOuterGenericT2_InterfaceWithValBase name: withOwnAndOuterGenericT2_InterfaceWithValBase origin: SOURCE - getDispatchReceiver(): test/ClassWithInterfaceWithVal KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtConstructorSymbol: callableIdIfNonLocal: null - origin: SOURCE_MEMBER_GENERATED + origin: SOURCE_MEMBER_GENERATED \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.descriptors.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.descriptors.txt index b679200f085..3f78699e503 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.descriptors.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.descriptors.txt @@ -2,28 +2,23 @@ KtFunctionSymbol: callableIdIfNonLocal: null name: noGenerics origin: LIBRARY - getDispatchReceiver(): test/Child KtFunctionSymbol: callableIdIfNonLocal: null name: withOuter origin: SOURCE - getDispatchReceiver(): test/Base KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString - origin: LIBRARY - getDispatchReceiver(): kotlin/Any \ No newline at end of file + origin: LIBRARY \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.txt index efa98e7f336..af193e521c8 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.txt @@ -2,32 +2,27 @@ KtFunctionSymbol: callableIdIfNonLocal: null name: noGenerics origin: SOURCE - getDispatchReceiver(): test/Child KtFunctionSymbol: callableIdIfNonLocal: null name: withOuter origin: SOURCE - getDispatchReceiver(): test/Base KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtConstructorSymbol: callableIdIfNonLocal: null - origin: SOURCE_MEMBER_GENERATED + origin: SOURCE_MEMBER_GENERATED \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.descriptors.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.descriptors.txt index 4ca57700338..408b9a0f96f 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.descriptors.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.descriptors.txt @@ -2,34 +2,28 @@ KtFunctionSymbol: callableIdIfNonLocal: null name: noGenerics origin: LIBRARY - getDispatchReceiver(): test/Child KtFunctionSymbol: callableIdIfNonLocal: null name: withOuter origin: SOURCE - getDispatchReceiver(): test/Base KtFunctionSymbol: callableIdIfNonLocal: null name: withOuterAndOwn origin: SOURCE - getDispatchReceiver(): test/Base KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString - origin: LIBRARY - getDispatchReceiver(): kotlin/Any \ No newline at end of file + origin: LIBRARY \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.txt index 6e75f46a4fc..89bd5c95f74 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.txt @@ -2,38 +2,32 @@ KtFunctionSymbol: callableIdIfNonLocal: null name: noGenerics origin: SOURCE - getDispatchReceiver(): test/Child KtFunctionSymbol: callableIdIfNonLocal: null name: withOuter origin: SOURCE - getDispatchReceiver(): test/Base KtFunctionSymbol: callableIdIfNonLocal: null name: withOuterAndOwn origin: SOURCE - getDispatchReceiver(): test/Child KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtConstructorSymbol: callableIdIfNonLocal: null - origin: SOURCE_MEMBER_GENERATED + origin: SOURCE_MEMBER_GENERATED \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.descriptors.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.descriptors.txt index f97e3bd14bc..19444fd4e9d 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.descriptors.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.descriptors.txt @@ -2,28 +2,23 @@ KtFunctionSymbol: callableIdIfNonLocal: test/TopLevel.Base.noGeneric name: noGeneric origin: LIBRARY - getDispatchReceiver(): test/TopLevel.test/TopLevel.Base KtFunctionSymbol: callableIdIfNonLocal: test/TopLevel.Base.withOuter name: withOuter origin: LIBRARY - getDispatchReceiver(): test/TopLevel.test/TopLevel.Base KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString - origin: LIBRARY - getDispatchReceiver(): kotlin/Any \ No newline at end of file + origin: LIBRARY \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.txt index 08a25e2c4b2..dc2913c8f3a 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.txt @@ -2,33 +2,27 @@ KtFunctionSymbol: callableIdIfNonLocal: test/TopLevel.Base.noGeneric name: noGeneric origin: SOURCE - getDispatchReceiver(): test/TopLevel.Base KtFunctionSymbol: callableIdIfNonLocal: test/TopLevel.Base.withOuter name: withOuter origin: SOURCE - getDispatchReceiver(): test/TopLevel.Base KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtConstructorSymbol: callableIdIfNonLocal: null - origin: SOURCE_MEMBER_GENERATED - getDispatchReceiver(): test/TopLevel + origin: SOURCE_MEMBER_GENERATED \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.descriptors.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.descriptors.txt index cbc027d3859..fa4927ffe28 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.descriptors.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.descriptors.txt @@ -2,34 +2,28 @@ KtFunctionSymbol: callableIdIfNonLocal: test/TopLevel.Base.noGeneric name: noGeneric origin: LIBRARY - getDispatchReceiver(): test/TopLevel.test/TopLevel.Base KtFunctionSymbol: callableIdIfNonLocal: test/TopLevel.Base.withOuter name: withOuter origin: LIBRARY - getDispatchReceiver(): test/TopLevel.test/TopLevel.Base KtFunctionSymbol: callableIdIfNonLocal: test/TopLevel.Child.withOwnAndOuter name: withOwnAndOuter origin: SOURCE - getDispatchReceiver(): test/TopLevel.test/TopLevel.Base KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString - origin: LIBRARY - getDispatchReceiver(): kotlin/Any \ No newline at end of file + origin: LIBRARY \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.txt index 7b5eb8d4933..3d5fc65e7a2 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.txt @@ -2,39 +2,32 @@ KtFunctionSymbol: callableIdIfNonLocal: test/TopLevel.Base.noGeneric name: noGeneric origin: SOURCE - getDispatchReceiver(): test/TopLevel.Base KtFunctionSymbol: callableIdIfNonLocal: test/TopLevel.Base.withOuter name: withOuter origin: SOURCE - getDispatchReceiver(): test/TopLevel.Base KtFunctionSymbol: callableIdIfNonLocal: test/TopLevel.Child.withOwnAndOuter name: withOwnAndOuter origin: SOURCE - getDispatchReceiver(): test/TopLevel.Child KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtConstructorSymbol: callableIdIfNonLocal: null - origin: SOURCE_MEMBER_GENERATED - getDispatchReceiver(): test/TopLevel + origin: SOURCE_MEMBER_GENERATED \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.descriptors.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.descriptors.txt index 51c3c15b0f2..c164ba0d77e 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.descriptors.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.descriptors.txt @@ -2,28 +2,23 @@ KtFunctionSymbol: callableIdIfNonLocal: test/TopLevel.Base.noGeneric name: noGeneric origin: LIBRARY - getDispatchReceiver(): test/TopLevel.test/TopLevel.Base KtFunctionSymbol: callableIdIfNonLocal: test/OtherTopLevel.Child.withOuter name: withOuter origin: SOURCE - getDispatchReceiver(): test/TopLevel.test/TopLevel.Base KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString - origin: LIBRARY - getDispatchReceiver(): kotlin/Any \ No newline at end of file + origin: LIBRARY \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.txt index 83a71dd6841..ce5a6c3f4bc 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.txt @@ -2,33 +2,27 @@ KtFunctionSymbol: callableIdIfNonLocal: test/TopLevel.Base.noGeneric name: noGeneric origin: SOURCE - getDispatchReceiver(): test/TopLevel.Base KtFunctionSymbol: callableIdIfNonLocal: test/OtherTopLevel.Child.withOuter name: withOuter origin: SOURCE - getDispatchReceiver(): test/OtherTopLevel.Child KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtConstructorSymbol: callableIdIfNonLocal: null - origin: SOURCE_MEMBER_GENERATED - getDispatchReceiver(): test/OtherTopLevel + origin: SOURCE_MEMBER_GENERATED \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.descriptors.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.descriptors.txt index ee0d33a1c41..c164ba0d77e 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.descriptors.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.descriptors.txt @@ -2,28 +2,23 @@ KtFunctionSymbol: callableIdIfNonLocal: test/TopLevel.Base.noGeneric name: noGeneric origin: LIBRARY - getDispatchReceiver(): test/TopLevel.test/TopLevel.Base KtFunctionSymbol: callableIdIfNonLocal: test/OtherTopLevel.Child.withOuter name: withOuter origin: SOURCE - getDispatchReceiver(): test/TopLevel.test/TopLevel.Base KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString - origin: LIBRARY - getDispatchReceiver(): kotlin/Any \ No newline at end of file + origin: LIBRARY \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.txt index 679ac3a3cf6..ce5a6c3f4bc 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.txt @@ -2,33 +2,27 @@ KtFunctionSymbol: callableIdIfNonLocal: test/TopLevel.Base.noGeneric name: noGeneric origin: SOURCE - getDispatchReceiver(): test/TopLevel.Base KtFunctionSymbol: callableIdIfNonLocal: test/OtherTopLevel.Child.withOuter name: withOuter origin: SOURCE - getDispatchReceiver(): test/OtherTopLevel.Child KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtConstructorSymbol: callableIdIfNonLocal: null - origin: SOURCE_MEMBER_GENERATED - getDispatchReceiver(): test/OtherTopLevel + origin: SOURCE_MEMBER_GENERATED \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.descriptors.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.descriptors.txt index 5e7c17acffa..193c56467a0 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.descriptors.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.descriptors.txt @@ -2,34 +2,28 @@ KtFunctionSymbol: callableIdIfNonLocal: test/TopLevel.Base.noGeneric name: noGeneric origin: LIBRARY - getDispatchReceiver(): test/TopLevel.test/TopLevel.Base KtFunctionSymbol: callableIdIfNonLocal: test/OtherTopLevel.Child.withOuter name: withOuter origin: SOURCE - getDispatchReceiver(): test/TopLevel.test/TopLevel.Base KtFunctionSymbol: callableIdIfNonLocal: test/OtherTopLevel.Child.withOwnAndOuter name: withOwnAndOuter origin: SOURCE - getDispatchReceiver(): test/TopLevel.test/TopLevel.Base KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString - origin: LIBRARY - getDispatchReceiver(): kotlin/Any \ No newline at end of file + origin: LIBRARY \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.txt index 7e4d781c740..d851687c632 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.txt @@ -2,39 +2,32 @@ KtFunctionSymbol: callableIdIfNonLocal: test/TopLevel.Base.noGeneric name: noGeneric origin: SOURCE - getDispatchReceiver(): test/TopLevel.Base KtFunctionSymbol: callableIdIfNonLocal: test/OtherTopLevel.Child.withOuter name: withOuter origin: SOURCE - getDispatchReceiver(): test/OtherTopLevel.Child KtFunctionSymbol: callableIdIfNonLocal: test/OtherTopLevel.Child.withOwnAndOuter name: withOwnAndOuter origin: SOURCE - getDispatchReceiver(): test/OtherTopLevel.Child KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtConstructorSymbol: callableIdIfNonLocal: null - origin: SOURCE_MEMBER_GENERATED - getDispatchReceiver(): test/OtherTopLevel + origin: SOURCE_MEMBER_GENERATED \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.descriptors.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.descriptors.txt index d19bc42cd2d..a4a4c788bc5 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.descriptors.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.descriptors.txt @@ -2,94 +2,78 @@ KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.iterator name: iterator origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.size name: size origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.isEmpty name: isEmpty origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.contains name: contains origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.toArray name: toArray origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.toArray name: toArray origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.add name: add origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.remove name: remove origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.containsAll name: containsAll origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.addAll name: addAll origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.removeAll name: removeAll origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.retainAll name: retainAll origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.clear name: clear - origin: JAVA - getDispatchReceiver(): java/util/Collection \ No newline at end of file + origin: JAVA \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.txt index 40e2d424ea6..361087dbf82 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.txt @@ -2,98 +2,82 @@ KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.size name: size origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.isEmpty name: isEmpty origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.contains name: contains origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: test/MyList.iterator name: iterator origin: JAVA - getDispatchReceiver(): test/MyList KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.toArray name: toArray origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.toArray name: toArray origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: test/MyList.add name: add origin: JAVA - getDispatchReceiver(): test/MyList KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.remove name: remove origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.containsAll name: containsAll origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: test/MyList.addAll name: addAll origin: JAVA - getDispatchReceiver(): test/MyList KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.removeAll name: removeAll origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.retainAll name: retainAll origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: java/util/Collection.clear name: clear origin: JAVA - getDispatchReceiver(): java/util/Collection KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtConstructorSymbol: callableIdIfNonLocal: null - origin: SOURCE_MEMBER_GENERATED + origin: SOURCE_MEMBER_GENERATED \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.descriptors.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.descriptors.txt index b614c0fca01..e2a72066122 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.descriptors.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.descriptors.txt @@ -2,28 +2,23 @@ KtFunctionSymbol: callableIdIfNonLocal: test/MyClass.funWithOuterAndOwnGenericsAndBounds name: funWithOuterAndOwnGenericsAndBounds origin: SOURCE - getDispatchReceiver(): test/MyInterface KtKotlinPropertySymbol: callableIdIfNonLocal: test/MyClass.propWithOuterAndOwnGenericsAndBounds name: propWithOuterAndOwnGenericsAndBounds origin: SOURCE - getDispatchReceiver(): test/MyInterface KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString - origin: LIBRARY - getDispatchReceiver(): kotlin/Any \ No newline at end of file + origin: LIBRARY \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.txt index b91a6a6b7fb..d58ff97bdf8 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.txt @@ -2,31 +2,26 @@ KtFunctionSymbol: callableIdIfNonLocal: test/MyClass.funWithOuterAndOwnGenericsAndBounds name: funWithOuterAndOwnGenericsAndBounds origin: SOURCE - getDispatchReceiver(): test/MyClass KtKotlinPropertySymbol: callableIdIfNonLocal: test/MyClass.propWithOuterAndOwnGenericsAndBounds name: propWithOuterAndOwnGenericsAndBounds origin: SOURCE - getDispatchReceiver(): test/MyClass KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtConstructorSymbol: callableIdIfNonLocal: null diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.descriptors.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.descriptors.txt index 35d4fa96e4b..d851af4cce4 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.descriptors.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.descriptors.txt @@ -2,28 +2,23 @@ KtKotlinPropertySymbol: callableIdIfNonLocal: test/MyInterface.withOwnGeneric_InterfaceWithValBase name: withOwnGeneric_InterfaceWithValBase origin: LIBRARY - getDispatchReceiver(): test/MyInterface KtKotlinPropertySymbol: callableIdIfNonLocal: test/Inheritor.withOwnAndOuterGenericAsTypeBound_InterfaceWithValBase name: withOwnAndOuterGenericAsTypeBound_InterfaceWithValBase origin: SOURCE - getDispatchReceiver(): test/MyInterface KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString - origin: LIBRARY - getDispatchReceiver(): kotlin/Any \ No newline at end of file + origin: LIBRARY \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.txt index f569a32b88a..3f622fd3d76 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.txt @@ -2,32 +2,27 @@ KtKotlinPropertySymbol: callableIdIfNonLocal: test/MyInterface.withOwnGeneric_InterfaceWithValBase name: withOwnGeneric_InterfaceWithValBase origin: SOURCE - getDispatchReceiver(): test/MyInterface KtKotlinPropertySymbol: callableIdIfNonLocal: test/Inheritor.withOwnAndOuterGenericAsTypeBound_InterfaceWithValBase name: withOwnAndOuterGenericAsTypeBound_InterfaceWithValBase origin: SOURCE - getDispatchReceiver(): test/Inheritor KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.equals name: equals origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.hashCode name: hashCode origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtFunctionSymbol: callableIdIfNonLocal: kotlin/Any.toString name: toString origin: LIBRARY - getDispatchReceiver(): kotlin/Any KtConstructorSymbol: callableIdIfNonLocal: null - origin: SOURCE_MEMBER_GENERATED + origin: SOURCE_MEMBER_GENERATED \ No newline at end of file