diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolDeclarationRendererProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolDeclarationRendererProvider.kt index 9472b043a73..4862e884a6a 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolDeclarationRendererProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolDeclarationRendererProvider.kt @@ -83,6 +83,11 @@ public data class KtDeclarationRendererOptions( val forceRenderingOverrideModifier: Boolean = false, val renderDefaultParameterValue: Boolean = true, + + /** + * Sort nested declarations by kind (enum values, then constructors, then properties, then functions) and name. + */ + val sortNestedDeclarations: Boolean = false, ) { public companion object { public val DEFAULT: KtDeclarationRendererOptions = KtDeclarationRendererOptions() 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 6585d19fdb1..471b7b00c00 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 @@ -48,7 +48,7 @@ public object DebugSymbolRenderer { } private fun StringBuilder.renderImpl(symbol: KtSymbol) { - val klass = symbol::class + val klass = getSymbolClass(symbol) appendLine("${klass.simpleName}:") klass.members.filterIsInstance>().sortedBy { it.name }.forEach { property -> if (property.name in ignoredPropertyNames) return@forEach @@ -67,7 +67,11 @@ public object DebugSymbolRenderer { null -> "null" is String -> value is Boolean -> value.toString() - is Long -> value.toString() + is Number -> value.toString() + is UByte -> value.toString() + is UShort -> value.toString() + is UInt -> value.toString() + is ULong -> value.toString() is Name -> value.asString() is FqName -> value.asString() is ClassId -> value.asString() @@ -93,7 +97,8 @@ public object DebugSymbolRenderer { is KtPropertySetterSymbol -> "" else -> TODO(value::class.toString()) } - "${value::class.simpleName!!}($symbolTag)" + val symbolKind = getSymbolClass(value).simpleName!! + "$symbolKind($symbolTag)" } is KtLiteralConstantValue<*> -> renderValue(value.value) is KtEnumEntryConstantValue -> "KtEnumEntryConstantValue(${renderValue(value.callableId)})" @@ -109,7 +114,24 @@ public object DebugSymbolRenderer { else -> value::class.simpleName!! } - private val ignoredPropertyNames = setOf("firRef", "psi", "token", "builder") + private fun getSymbolClass(symbol: KtSymbol): KClass<*> { + var current: Class = symbol.javaClass + + while (true) { + val className = current.name + if (symbolImplementationPackageNames.none { className.startsWith("$it.") }) { + return current.kotlin + } + current = current.superclass + } + } + + private val ignoredPropertyNames = setOf("psi", "token") + + private val symbolImplementationPackageNames = listOf( + "org.jetbrains.kotlin.analysis.api.fir", + "org.jetbrains.kotlin.analysis.api.descriptors", + ) private const val INDENT = 2 } diff --git a/analysis/analysis-api/testData/analysisSession/resolveCall/annotationInAnnotation_multipleAnnotations_arrayOf.txt b/analysis/analysis-api/testData/analysisSession/resolveCall/annotationInAnnotation_multipleAnnotations_arrayOf.txt index f3b98d8ea6a..f9f4db4abc0 100644 --- a/analysis/analysis-api/testData/analysisSession/resolveCall/annotationInAnnotation_multipleAnnotations_arrayOf.txt +++ b/analysis/analysis-api/testData/analysisSession/resolveCall/annotationInAnnotation_multipleAnnotations_arrayOf.txt @@ -1,4 +1,4 @@ KtFunctionCall: argumentMapping = { Annotation("v1", "v2") -> (vararg elements: Annotation), Annotation(strings = arrayOf("v3", "v4")) -> (vararg elements: Annotation) } targetFunction = kotlin/arrayOf(vararg elements: Annotation): kotlin.Array -substitutor = +substitutor = \ No newline at end of file diff --git a/analysis/analysis-api/testData/analysisSession/resolveCall/arrayOfInAnnotation.txt b/analysis/analysis-api/testData/analysisSession/resolveCall/arrayOfInAnnotation.txt index 0af738d585b..b02bd7a3a4b 100644 --- a/analysis/analysis-api/testData/analysisSession/resolveCall/arrayOfInAnnotation.txt +++ b/analysis/analysis-api/testData/analysisSession/resolveCall/arrayOfInAnnotation.txt @@ -1,4 +1,4 @@ KtFunctionCall: argumentMapping = { 1 -> (vararg elements: kotlin.Int), 2 -> (vararg elements: kotlin.Int), 3 -> (vararg elements: kotlin.Int) } targetFunction = kotlin/arrayOf(vararg elements: kotlin.Int): kotlin.Array -substitutor = \ No newline at end of file +substitutor = \ No newline at end of file diff --git a/analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.txt b/analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.txt index 89e8c59ddc8..4f1694b3685 100644 --- a/analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.txt +++ b/analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.txt @@ -1,4 +1,4 @@ KtFunctionCall: argumentMapping = { 1 -> (a: kotlin.Int) } targetFunction = /function(: kotlin.String, a: kotlin.Int): kotlin.Unit -substitutor = \ No newline at end of file +substitutor = \ No newline at end of file diff --git a/analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithTypeArgument.txt b/analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithTypeArgument.txt index f6f165321f6..a42e7a09174 100644 --- a/analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithTypeArgument.txt +++ b/analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithTypeArgument.txt @@ -1,4 +1,4 @@ KtFunctionCall: argumentMapping = { 1 -> (a: kotlin.Int), "" -> (b: kotlin.String) } targetFunction = /function(a: kotlin.Int, b: kotlin.String): kotlin.Unit -substitutor = \ No newline at end of file +substitutor = \ No newline at end of file diff --git a/analysis/analysis-api/testData/analysisSession/resolveCall/memberFunctionCallWithTypeArgument.txt b/analysis/analysis-api/testData/analysisSession/resolveCall/memberFunctionCallWithTypeArgument.txt index fe3f635a3fb..87158fe0e86 100644 --- a/analysis/analysis-api/testData/analysisSession/resolveCall/memberFunctionCallWithTypeArgument.txt +++ b/analysis/analysis-api/testData/analysisSession/resolveCall/memberFunctionCallWithTypeArgument.txt @@ -1,4 +1,4 @@ KtFunctionCall: argumentMapping = { 1 -> (r: kotlin.Int) } targetFunction = /A.foo(: A, r: kotlin.Int): kotlin.Unit -substitutor = \ No newline at end of file +substitutor = \ No newline at end of file diff --git a/analysis/analysis-api/testData/analysisSession/resolveCall/resolveCallInSuperConstructorParam.txt b/analysis/analysis-api/testData/analysisSession/resolveCall/resolveCallInSuperConstructorParam.txt index d8a4bb92d5c..f982f2656d6 100644 --- a/analysis/analysis-api/testData/analysisSession/resolveCall/resolveCallInSuperConstructorParam.txt +++ b/analysis/analysis-api/testData/analysisSession/resolveCall/resolveCallInSuperConstructorParam.txt @@ -1,4 +1,4 @@ KtFunctionCall: argumentMapping = { 2 -> (other: kotlin.Int) } targetFunction = /to(: kotlin.Int, other: kotlin.Int): kotlin.Int -substitutor = \ No newline at end of file +substitutor = \ No newline at end of file diff --git a/analysis/analysis-api/testData/analysisSession/resolveCall/samConstructorCall.txt b/analysis/analysis-api/testData/analysisSession/resolveCall/samConstructorCall.txt index b565dc1c2c0..90653956697 100644 --- a/analysis/analysis-api/testData/analysisSession/resolveCall/samConstructorCall.txt +++ b/analysis/analysis-api/testData/analysisSession/resolveCall/samConstructorCall.txt @@ -1,4 +1,4 @@ KtFunctionCall: argumentMapping = { {x: Int, y: Int -> 1} -> (function: kotlin.Function2, ft, kotlin.Int>) } targetFunction = java/util/Comparator(function: kotlin.Function2, ft, kotlin.Int>): java.util.Comparator> -substitutor = }> \ No newline at end of file +substitutor = }> \ No newline at end of file diff --git a/analysis/analysis-api/testData/analysisSession/resolveCall/variableWithExtensionInvoke.txt b/analysis/analysis-api/testData/analysisSession/resolveCall/variableWithExtensionInvoke.txt index 9ebfb7ed0b6..3f7cbccf2d8 100644 --- a/analysis/analysis-api/testData/analysisSession/resolveCall/variableWithExtensionInvoke.txt +++ b/analysis/analysis-api/testData/analysisSession/resolveCall/variableWithExtensionInvoke.txt @@ -2,4 +2,4 @@ KtVariableWithInvokeFunctionCall: target = f: Foo argumentMapping = { "" -> (t: kotlin.String) } targetFunction = /invoke(: Foo, t: kotlin.String): kotlin.Unit -substitutor = \ No newline at end of file +substitutor = \ No newline at end of file diff --git a/analysis/analysis-api/testData/analysisSession/resolveCall/variableWithMemberInvoke.txt b/analysis/analysis-api/testData/analysisSession/resolveCall/variableWithMemberInvoke.txt index 454fff0caa4..4544b64c82c 100644 --- a/analysis/analysis-api/testData/analysisSession/resolveCall/variableWithMemberInvoke.txt +++ b/analysis/analysis-api/testData/analysisSession/resolveCall/variableWithMemberInvoke.txt @@ -2,4 +2,4 @@ KtVariableWithInvokeFunctionCall: target = f: Foo argumentMapping = { "" -> (t: kotlin.String) } targetFunction = /Foo.invoke(: Foo, t: kotlin.String): kotlin.Unit -substitutor = \ No newline at end of file +substitutor = \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/declarationRenderer/annotation.rendered b/analysis/analysis-api/testData/components/declarationRenderer/annotation.rendered index e8c7bc76a38..3b5cd27146f 100644 --- a/analysis/analysis-api/testData/components/declarationRenderer/annotation.rendered +++ b/analysis/analysis-api/testData/components/declarationRenderer/annotation.rendered @@ -2,8 +2,8 @@ @base annotation class derived @base class correct { constructor(@base x: Int) - @base val x: Int @base constructor() + @base val x: Int } @base enum class My { FIRST, diff --git a/analysis/analysis-api/testData/components/declarationRenderer/delegates.rendered b/analysis/analysis-api/testData/components/declarationRenderer/delegates.rendered index 5a336399b93..4da4a1f9353 100644 --- a/analysis/analysis-api/testData/components/declarationRenderer/delegates.rendered +++ b/analysis/analysis-api/testData/components/declarationRenderer/delegates.rendered @@ -1,6 +1,6 @@ interface MyRwProperty { - operator fun setValue(thisRef: T, property: Any, value: V) operator fun getValue(thisRef: T, property: Any): V + operator fun setValue(thisRef: T, property: Any, value: V) } val x: Int get() diff --git a/analysis/analysis-api/testData/components/declarationRenderer/enums.rendered b/analysis/analysis-api/testData/components/declarationRenderer/enums.rendered index 65e7f5857ad..ce3355981ba 100644 --- a/analysis/analysis-api/testData/components/declarationRenderer/enums.rendered +++ b/analysis/analysis-api/testData/components/declarationRenderer/enums.rendered @@ -8,9 +8,9 @@ enum class Planet { VENERA, EARTH, constructor(m: Double, r: Double) + val g: Double val m: Double internal val r: Double - val g: Double abstract fun sayHello() companion object { const val G: Double diff --git a/analysis/analysis-api/testData/components/declarationRenderer/noPrimaryConstructor.rendered b/analysis/analysis-api/testData/components/declarationRenderer/noPrimaryConstructor.rendered index f9420c5657b..94888bf3020 100644 --- a/analysis/analysis-api/testData/components/declarationRenderer/noPrimaryConstructor.rendered +++ b/analysis/analysis-api/testData/components/declarationRenderer/noPrimaryConstructor.rendered @@ -1,5 +1,5 @@ class NoPrimary { - val x: String - constructor(x: String) constructor() + constructor(x: String) + val x: String } diff --git a/analysis/analysis-api/testData/components/declarationRenderer/simpleClass.rendered b/analysis/analysis-api/testData/components/declarationRenderer/simpleClass.rendered index 74d31da055e..60250b90e10 100644 --- a/analysis/analysis-api/testData/components/declarationRenderer/simpleClass.rendered +++ b/analysis/analysis-api/testData/components/declarationRenderer/simpleClass.rendered @@ -1,13 +1,13 @@ interface SomeInterface { - fun foo(x: Int, y: String): String val bar: Boolean + fun foo(x: Int, y: String): String } class SomeClass : SomeInterface { - private val baz: Int - override fun foo(x: Int, y: String): String override var bar: Boolean get() set(value: Boolean) + private val baz: Int lateinit var fau: Double + override fun foo(x: Int, y: String): String } inline class InlineClass diff --git a/analysis/analysis-api/testData/components/declarationRenderer/typeParameterVsNested.rendered b/analysis/analysis-api/testData/components/declarationRenderer/typeParameterVsNested.rendered index 138f7e1ce63..4f7bdaecc8e 100644 --- a/analysis/analysis-api/testData/components/declarationRenderer/typeParameterVsNested.rendered +++ b/analysis/analysis-api/testData/components/declarationRenderer/typeParameterVsNested.rendered @@ -1,9 +1,9 @@ interface Some abstract class My { - open inner class T abstract val x: T - abstract fun foo(arg: T) abstract val y: My.T abstract val z: My.T + abstract fun foo(arg: T) abstract class Some : My.T + open inner class T } diff --git a/analysis/analysis-api/testData/components/declarationRenderer/typeParameters.rendered b/analysis/analysis-api/testData/components/declarationRenderer/typeParameters.rendered index 41b8bc6eab3..33eea6a7473 100644 --- a/analysis/analysis-api/testData/components/declarationRenderer/typeParameters.rendered +++ b/analysis/analysis-api/testData/components/declarationRenderer/typeParameters.rendered @@ -1,11 +1,11 @@ interface List { - operator fun get(index: Int): T infix fun concat(other: List): List + operator fun get(index: Int): T } typealias StringList = List typealias AnyList = List<*> abstract class AbstractList : List class SomeList : AbstractList { - override operator fun get(index: Int): Int override infix fun concat(other: List): List + override operator fun get(index: Int): Int } diff --git a/analysis/analysis-api/testData/fileScopeTest/simpleFileScope.txt b/analysis/analysis-api/testData/fileScopeTest/simpleFileScope.txt index 15112514967..90f3a6fcfab 100644 --- a/analysis/analysis-api/testData/fileScopeTest/simpleFileScope.txt +++ b/analysis/analysis-api/testData/fileScopeTest/simpleFileScope.txt @@ -1,5 +1,5 @@ FILE SYMBOL: -KtFirFileSymbol: +KtFileSymbol: annotationClassIds: [] annotations: [] origin: SOURCE @@ -9,7 +9,7 @@ CALLABLE NAMES: [test, testVal] CALLABLE SYMBOLS: -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -34,13 +34,13 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] callableIdIfNonLocal: /testVal dispatchType: null - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: true hasGetter: true hasSetter: false @@ -69,7 +69,7 @@ CLASSIFIER NAMES: [C, I] CLASSIFIER SYMBOLS: -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: C @@ -91,7 +91,7 @@ KtFirNamedClassOrObjectSymbol: visibility: Public deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: I diff --git a/analysis/analysis-api/testData/memberScopeByFqName/Int.txt b/analysis/analysis-api/testData/memberScopeByFqName/Int.txt index a564fbd1af4..2f8fff8903b 100644 --- a/analysis/analysis-api/testData/memberScopeByFqName/Int.txt +++ b/analysis/analysis-api/testData/memberScopeByFqName/Int.txt @@ -1,4 +1,4 @@ -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -20,12 +20,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -47,12 +47,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -74,12 +74,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -101,12 +101,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -128,12 +128,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -155,12 +155,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -182,12 +182,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -212,7 +212,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -234,12 +234,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Double annotationClassIds: [] annotations: [] @@ -261,12 +261,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Float annotationClassIds: [] annotations: [] @@ -288,12 +288,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -315,12 +315,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Long annotationClassIds: [] annotations: [] @@ -342,12 +342,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -369,12 +369,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -399,7 +399,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -424,7 +424,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -446,12 +446,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Double annotationClassIds: [] annotations: [] @@ -473,12 +473,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Float annotationClassIds: [] annotations: [] @@ -500,12 +500,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -527,12 +527,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Long annotationClassIds: [] annotations: [] @@ -554,12 +554,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -581,12 +581,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -608,12 +608,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -635,12 +635,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Double annotationClassIds: [] annotations: [] @@ -662,12 +662,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Float annotationClassIds: [] annotations: [] @@ -689,12 +689,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -716,12 +716,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Long annotationClassIds: [] annotations: [] @@ -743,12 +743,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -770,12 +770,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/ranges/IntRange annotationClassIds: [] annotations: [] @@ -797,12 +797,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/ranges/IntRange annotationClassIds: [] annotations: [] @@ -824,12 +824,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/ranges/LongRange annotationClassIds: [] annotations: [] @@ -851,12 +851,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/ranges/IntRange annotationClassIds: [] annotations: [] @@ -878,12 +878,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [ kotlin/SinceKotlin @@ -910,12 +910,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Double annotationClassIds: [ kotlin/SinceKotlin @@ -942,12 +942,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Float annotationClassIds: [ kotlin/SinceKotlin @@ -974,12 +974,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [ kotlin/SinceKotlin @@ -1006,12 +1006,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Long annotationClassIds: [ kotlin/SinceKotlin @@ -1038,12 +1038,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [ kotlin/SinceKotlin @@ -1070,12 +1070,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -1097,12 +1097,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(bitCount) + KtValueParameterSymbol(bitCount) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -1124,12 +1124,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(bitCount) + KtValueParameterSymbol(bitCount) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -1151,12 +1151,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Double annotationClassIds: [] annotations: [] @@ -1178,12 +1178,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Float annotationClassIds: [] annotations: [] @@ -1205,12 +1205,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -1232,12 +1232,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Long annotationClassIds: [] annotations: [] @@ -1259,12 +1259,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -1286,12 +1286,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Byte annotationClassIds: [] annotations: [] @@ -1316,7 +1316,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Char annotationClassIds: [] annotations: [] @@ -1341,7 +1341,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Double annotationClassIds: [] annotations: [] @@ -1366,7 +1366,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Float annotationClassIds: [] annotations: [] @@ -1391,7 +1391,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -1416,7 +1416,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Long annotationClassIds: [] annotations: [] @@ -1441,7 +1441,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Short annotationClassIds: [] annotations: [] @@ -1466,7 +1466,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -1491,7 +1491,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -1516,7 +1516,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -1538,12 +1538,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(bitCount) + KtValueParameterSymbol(bitCount) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -1565,12 +1565,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -1592,12 +1592,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -1622,7 +1622,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/String annotationClassIds: [] annotations: [] @@ -1647,7 +1647,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: kotlin/Int.Companion @@ -1669,7 +1669,7 @@ KtFirNamedClassOrObjectSymbol: visibility: Public deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] java/lang/Integer annotationClassIds: [] annotations: [] @@ -1684,12 +1684,12 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] diff --git a/analysis/analysis-api/testData/memberScopeByFqName/MutableList.txt b/analysis/analysis-api/testData/memberScopeByFqName/MutableList.txt index 2b3ff05a755..3a74f2f8fef 100644 --- a/analysis/analysis-api/testData/memberScopeByFqName/MutableList.txt +++ b/analysis/analysis-api/testData/memberScopeByFqName/MutableList.txt @@ -1,4 +1,4 @@ -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -20,12 +20,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(element) + KtValueParameterSymbol(element) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] @@ -47,13 +47,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(index) - KtFirValueParameterSymbol(element) + KtValueParameterSymbol(index) + KtValueParameterSymbol(element) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -75,13 +75,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(index) - KtFirValueParameterSymbol(elements) + KtValueParameterSymbol(index) + KtValueParameterSymbol(elements) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -103,12 +103,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(elements) + KtValueParameterSymbol(elements) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] @@ -133,7 +133,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/collections/MutableListIterator annotationClassIds: [] annotations: [] @@ -158,7 +158,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/collections/MutableListIterator annotationClassIds: [] annotations: [] @@ -180,12 +180,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(index) + KtValueParameterSymbol(index) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -207,12 +207,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(element) + KtValueParameterSymbol(element) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -234,12 +234,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(elements) + KtValueParameterSymbol(elements) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] E annotationClassIds: [] annotations: [] @@ -261,12 +261,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(index) + KtValueParameterSymbol(index) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -288,12 +288,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(elements) + KtValueParameterSymbol(elements) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] E annotationClassIds: [] annotations: [] @@ -315,13 +315,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(index) - KtFirValueParameterSymbol(element) + KtValueParameterSymbol(index) + KtValueParameterSymbol(element) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/collections/MutableList annotationClassIds: [] annotations: [] @@ -343,13 +343,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(fromIndex) - KtFirValueParameterSymbol(toIndex) + KtValueParameterSymbol(fromIndex) + KtValueParameterSymbol(toIndex) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -371,12 +371,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(element) + KtValueParameterSymbol(element) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -398,12 +398,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(elements) + KtValueParameterSymbol(elements) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] E annotationClassIds: [] annotations: [] @@ -425,12 +425,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(index) + KtValueParameterSymbol(index) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -452,12 +452,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(element) + KtValueParameterSymbol(element) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -482,7 +482,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/collections/MutableIterator annotationClassIds: [] annotations: [] @@ -507,7 +507,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -529,12 +529,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(element) + KtValueParameterSymbol(element) ] visibility: Public deprecationStatus: null -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -565,7 +565,7 @@ KtFirKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -587,12 +587,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -617,7 +617,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/String annotationClassIds: [] annotations: [] diff --git a/analysis/analysis-api/testData/memberScopeByFqName/java.lang.String.txt b/analysis/analysis-api/testData/memberScopeByFqName/java.lang.String.txt index 2b5dda31c93..a725e5d1a4e 100644 --- a/analysis/analysis-api/testData/memberScopeByFqName/java.lang.String.txt +++ b/analysis/analysis-api/testData/memberScopeByFqName/java.lang.String.txt @@ -1,4 +1,4 @@ -KtFirJavaFieldSymbol: +KtJavaFieldSymbol: annotatedType: [] ft callableIdIfNonLocal: java/lang/String.value isExtension: false @@ -12,7 +12,7 @@ KtFirJavaFieldSymbol: visibility: Private deprecationStatus: null -KtFirJavaFieldSymbol: +KtJavaFieldSymbol: annotatedType: [] kotlin/Int callableIdIfNonLocal: java/lang/String.hash isExtension: false @@ -26,7 +26,7 @@ KtFirJavaFieldSymbol: visibility: Private deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -51,7 +51,7 @@ KtFirFunctionSymbol: visibility: PackageVisibility deprecationStatus: null -KtFirJavaFieldSymbol: +KtJavaFieldSymbol: annotatedType: [] kotlin/Int callableIdIfNonLocal: java/lang/String.hash32 isExtension: false @@ -65,13 +65,13 @@ KtFirJavaFieldSymbol: visibility: Private deprecationStatus: null -KtFirSyntheticJavaPropertySymbol: +KtSyntheticJavaPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] callableIdIfNonLocal: java/lang/String.length dispatchType: java/lang/String - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: true hasGetter: true hasSetter: false @@ -81,7 +81,7 @@ KtFirSyntheticJavaPropertySymbol: isOverride: false isStatic: false isVal: true - javaGetterSymbol: KtFirFunctionSymbol(java/lang/String.length) + javaGetterSymbol: KtFunctionSymbol(java/lang/String.length) javaSetterSymbol: null modality: OPEN name: length @@ -96,7 +96,7 @@ KtFirSyntheticJavaPropertySymbol: javaSetterName: null setterDeprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -121,7 +121,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -143,12 +143,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -170,12 +170,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -197,13 +197,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -225,13 +225,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] @@ -253,13 +253,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: PackageVisibility deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] @@ -281,15 +281,15 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) - KtFirValueParameterSymbol(p2) - KtFirValueParameterSymbol(p3) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) + KtValueParameterSymbol(p2) + KtValueParameterSymbol(p3) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [ kotlin/Deprecated @@ -316,15 +316,15 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) - KtFirValueParameterSymbol(p2) - KtFirValueParameterSymbol(p3) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) + KtValueParameterSymbol(p2) + KtValueParameterSymbol(p3) ] visibility: Public deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=Deprecated in Java) -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] ft annotationClassIds: [] annotations: [] @@ -346,12 +346,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] ft annotationClassIds: [] annotations: [] @@ -373,12 +373,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] ft annotationClassIds: [] annotations: [] @@ -403,7 +403,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -425,12 +425,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -452,12 +452,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -479,12 +479,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -506,12 +506,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -533,12 +533,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -560,12 +560,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -587,15 +587,15 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) - KtFirValueParameterSymbol(p2) - KtFirValueParameterSymbol(p3) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) + KtValueParameterSymbol(p2) + KtValueParameterSymbol(p3) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -617,16 +617,16 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) - KtFirValueParameterSymbol(p2) - KtFirValueParameterSymbol(p3) - KtFirValueParameterSymbol(p4) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) + KtValueParameterSymbol(p2) + KtValueParameterSymbol(p3) + KtValueParameterSymbol(p4) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -648,13 +648,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -676,12 +676,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -703,12 +703,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -733,7 +733,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -755,12 +755,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -782,13 +782,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -810,12 +810,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -837,13 +837,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -865,13 +865,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: Private deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -893,12 +893,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -920,13 +920,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -948,12 +948,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -975,13 +975,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -1003,13 +1003,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: Private deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] ft annotationClassIds: [] annotations: [] @@ -1031,12 +1031,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] ft annotationClassIds: [] annotations: [] @@ -1058,13 +1058,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/CharSequence annotationClassIds: [] annotations: [] @@ -1086,13 +1086,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] ft annotationClassIds: [] annotations: [] @@ -1114,12 +1114,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] ft annotationClassIds: [] annotations: [] @@ -1141,13 +1141,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] ft annotationClassIds: [] annotations: [] @@ -1169,13 +1169,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -1197,12 +1197,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -1224,12 +1224,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] ft annotationClassIds: [] annotations: [] @@ -1251,13 +1251,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] ft annotationClassIds: [] annotations: [] @@ -1279,13 +1279,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] ft>, kotlin/Array>?> annotationClassIds: [] annotations: [] @@ -1307,13 +1307,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] ft>, kotlin/Array>?> annotationClassIds: [] annotations: [] @@ -1335,12 +1335,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] ft annotationClassIds: [] annotations: [] @@ -1362,12 +1362,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] ft annotationClassIds: [] annotations: [] @@ -1392,7 +1392,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] ft annotationClassIds: [] annotations: [] @@ -1414,12 +1414,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] ft annotationClassIds: [] annotations: [] @@ -1444,7 +1444,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] ft annotationClassIds: [] annotations: [] @@ -1469,7 +1469,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String annotationClassIds: [] annotations: [] @@ -1494,7 +1494,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] ft annotationClassIds: [] annotations: [] @@ -1519,7 +1519,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] ft annotationClassIds: [] annotations: [] @@ -1544,7 +1544,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Char annotationClassIds: [] annotations: [] @@ -1566,12 +1566,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: java/lang/String.CaseInsensitiveComparator @@ -1595,7 +1595,7 @@ KtFirNamedClassOrObjectSymbol: visibility: Private deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] java/lang/String annotationClassIds: [] annotations: [] @@ -1613,7 +1613,7 @@ KtFirConstructorSymbol: visibility: Public deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] java/lang/String annotationClassIds: [] annotations: [] @@ -1628,12 +1628,12 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] java/lang/String annotationClassIds: [] annotations: [] @@ -1648,12 +1648,12 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] java/lang/String annotationClassIds: [] annotations: [] @@ -1668,14 +1668,14 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) - KtFirValueParameterSymbol(p2) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) + KtValueParameterSymbol(p2) ] visibility: Public deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] java/lang/String annotationClassIds: [] annotations: [] @@ -1690,14 +1690,14 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) - KtFirValueParameterSymbol(p2) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) + KtValueParameterSymbol(p2) ] visibility: Public deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] java/lang/String annotationClassIds: [ kotlin/Deprecated @@ -1717,15 +1717,15 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) - KtFirValueParameterSymbol(p2) - KtFirValueParameterSymbol(p3) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) + KtValueParameterSymbol(p2) + KtValueParameterSymbol(p3) ] visibility: Public deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=Deprecated in Java) -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] java/lang/String annotationClassIds: [ kotlin/Deprecated @@ -1745,13 +1745,13 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: Public deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=Deprecated in Java) -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] java/lang/String annotationClassIds: [] annotations: [] @@ -1766,15 +1766,15 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) - KtFirValueParameterSymbol(p2) - KtFirValueParameterSymbol(p3) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) + KtValueParameterSymbol(p2) + KtValueParameterSymbol(p3) ] visibility: Public deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] java/lang/String annotationClassIds: [] annotations: [] @@ -1789,15 +1789,15 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) - KtFirValueParameterSymbol(p2) - KtFirValueParameterSymbol(p3) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) + KtValueParameterSymbol(p2) + KtValueParameterSymbol(p3) ] visibility: Public deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] java/lang/String annotationClassIds: [] annotations: [] @@ -1812,13 +1812,13 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: Public deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] java/lang/String annotationClassIds: [] annotations: [] @@ -1833,13 +1833,13 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: Public deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] java/lang/String annotationClassIds: [] annotations: [] @@ -1854,14 +1854,14 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) - KtFirValueParameterSymbol(p2) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) + KtValueParameterSymbol(p2) ] visibility: Public deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] java/lang/String annotationClassIds: [] annotations: [] @@ -1876,12 +1876,12 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] java/lang/String annotationClassIds: [] annotations: [] @@ -1896,12 +1896,12 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] java/lang/String annotationClassIds: [] annotations: [] @@ -1916,12 +1916,12 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] java/lang/String annotationClassIds: [] annotations: [] @@ -1936,13 +1936,13 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) ] visibility: PackageVisibility deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] java/lang/String annotationClassIds: [ kotlin/Deprecated @@ -1962,9 +1962,9 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p0) - KtFirValueParameterSymbol(p1) - KtFirValueParameterSymbol(p2) + KtValueParameterSymbol(p0) + KtValueParameterSymbol(p1) + KtValueParameterSymbol(p2) ] visibility: PackageVisibility deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=Deprecated in Java) diff --git a/analysis/analysis-api/testData/memberScopeByFqName/kotlin.Function2.txt b/analysis/analysis-api/testData/memberScopeByFqName/kotlin.Function2.txt index 0a2bbb21ad9..f728006b08b 100644 --- a/analysis/analysis-api/testData/memberScopeByFqName/kotlin.Function2.txt +++ b/analysis/analysis-api/testData/memberScopeByFqName/kotlin.Function2.txt @@ -1,4 +1,4 @@ -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] R annotationClassIds: [] annotations: [] @@ -20,13 +20,13 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(p1) - KtFirValueParameterSymbol(p2) + KtValueParameterSymbol(p1) + KtValueParameterSymbol(p2) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Boolean annotationClassIds: [] annotations: [] @@ -48,12 +48,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(other) + KtValueParameterSymbol(other) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -78,7 +78,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/String annotationClassIds: [] annotations: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/class.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/class.txt index f6ba37b7a44..32822e61a79 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/class.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/class.txt @@ -1,4 +1,4 @@ -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: kotlin/Lazy @@ -17,7 +17,7 @@ KtFirNamedClassOrObjectSymbol: ] symbolKind: TOP_LEVEL typeParameters: [ - KtFirTypeParameterSymbol(T) + KtTypeParameterSymbol(T) ] visibility: Public deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.txt index 32d4220c2fe..aed2a32ca5d 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.txt @@ -1,4 +1,4 @@ -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: java/lang/String diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt index 2fbcef376fa..f67745522ff 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt @@ -1,4 +1,4 @@ -KtFirEnumEntrySymbol: +KtEnumEntrySymbol: annotatedType: [] kotlin/LazyThreadSafetyMode callableIdIfNonLocal: kotlin/LazyThreadSafetyMode.SYNCHRONIZED containingEnumClassIdIfNonLocal: kotlin/LazyThreadSafetyMode diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt index 2591bfa7a7e..2c7074b9c98 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt @@ -1,4 +1,4 @@ -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/collections/List annotationClassIds: [] annotations: [] @@ -19,15 +19,15 @@ KtFirFunctionSymbol: receiverType: null symbolKind: TOP_LEVEL typeParameters: [ - KtFirTypeParameterSymbol(T) + KtTypeParameterSymbol(T) ] valueParameters: [ - KtFirValueParameterSymbol(element) + KtValueParameterSymbol(element) ] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/collections/List annotationClassIds: [ kotlin/internal/InlineOnly @@ -53,13 +53,13 @@ KtFirFunctionSymbol: receiverType: null symbolKind: TOP_LEVEL typeParameters: [ - KtFirTypeParameterSymbol(T) + KtTypeParameterSymbol(T) ] valueParameters: [] visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/collections/List annotationClassIds: [] annotations: [] @@ -80,10 +80,10 @@ KtFirFunctionSymbol: receiverType: null symbolKind: TOP_LEVEL typeParameters: [ - KtFirTypeParameterSymbol(T) + KtTypeParameterSymbol(T) ] valueParameters: [ - KtFirValueParameterSymbol(elements) + KtValueParameterSymbol(elements) ] visibility: Public deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/iterator.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/iterator.txt index 6022d2b588f..26b52562c22 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/iterator.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/iterator.txt @@ -1,4 +1,4 @@ -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: kotlin/collections/Iterator @@ -17,7 +17,7 @@ KtFirNamedClassOrObjectSymbol: ] symbolKind: TOP_LEVEL typeParameters: [ - KtFirTypeParameterSymbol(T) + KtTypeParameterSymbol(T) ] visibility: Public deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/listOf.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/listOf.txt index aa8997c08e7..1ffc89c842d 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/listOf.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/listOf.txt @@ -1,4 +1,4 @@ -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: kotlin/io/FileWalkDirection diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt index 297be9dc658..5adb62800fe 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt @@ -1,4 +1,4 @@ -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] E annotationClassIds: [] annotations: [] @@ -20,7 +20,7 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(index) + KtValueParameterSymbol(index) ] visibility: Public deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt index 502836e2d93..b33302df45a 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt @@ -1,4 +1,4 @@ -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/collections/ListIterator annotationClassIds: [] annotations: [] @@ -23,7 +23,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/collections/ListIterator annotationClassIds: [] annotations: [] @@ -45,7 +45,7 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(index) + KtValueParameterSymbol(index) ] visibility: Public deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/nestedClass.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/nestedClass.txt index 285919a7449..00903dedca8 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/nestedClass.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/nestedClass.txt @@ -1,4 +1,4 @@ -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: kotlin/collections/MutableMap.MutableEntry @@ -17,8 +17,8 @@ KtFirNamedClassOrObjectSymbol: ] symbolKind: CLASS_MEMBER typeParameters: [ - KtFirTypeParameterSymbol(K) - KtFirTypeParameterSymbol(V) + KtTypeParameterSymbol(K) + KtTypeParameterSymbol(V) ] visibility: Public deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt index 7f6c2f30d1b..cb3b1a02509 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt @@ -1,4 +1,4 @@ -KtFirValueParameterSymbol: +KtValueParameterSymbol: annotatedType: [] kotlin/String annotationClassIds: [] annotations: [] @@ -12,7 +12,7 @@ KtFirValueParameterSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirValueParameterSymbol: +KtValueParameterSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -26,7 +26,7 @@ KtFirValueParameterSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] Anno annotationClassIds: [] annotations: [] @@ -41,13 +41,13 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(param1) - KtFirValueParameterSymbol(param2) + KtValueParameterSymbol(param1) + KtValueParameterSymbol(param2) ] visibility: Public deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: Anno @@ -69,7 +69,7 @@ KtFirNamedClassOrObjectSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [ Anno @@ -99,7 +99,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [ Anno ] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt index 27f27536aec..50f9b3da2ec 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt @@ -1,4 +1,4 @@ -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] @@ -23,13 +23,13 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] callableIdIfNonLocal: null dispatchType: - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: true hasGetter: true hasSetter: false @@ -54,7 +54,7 @@ KtFirKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: null -KtFirAnonymousObjectSymbol: +KtAnonymousObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: null @@ -67,13 +67,13 @@ KtFirAnonymousObjectSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] java/lang/Runnable annotationClassIds: [] annotations: [] callableIdIfNonLocal: /AnonymousContainer.anonymousObject dispatchType: AnonymousContainer - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: true hasGetter: true hasSetter: false @@ -98,7 +98,7 @@ KtFirKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: AnonymousContainer diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt index e73d1682e5f..c9e173f1db0 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt @@ -1,4 +1,4 @@ -KtFirPropertyGetterSymbol: +KtPropertyGetterSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -18,7 +18,7 @@ KtFirPropertyGetterSymbol: visibility: Public deprecationStatus: null -KtFirValueParameterSymbol: +KtValueParameterSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -32,7 +32,7 @@ KtFirValueParameterSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirPropertySetterSymbol: +KtPropertySetterSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] @@ -46,22 +46,22 @@ KtFirPropertySetterSymbol: isOverride: false modality: FINAL origin: SOURCE - parameter: KtFirValueParameterSymbol(value) + parameter: KtValueParameterSymbol(value) receiverType: null symbolKind: ACCESSOR valueParameters: [ - KtFirValueParameterSymbol(value) + KtValueParameterSymbol(value) ] visibility: Public deprecationStatus: null -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] callableIdIfNonLocal: /p dispatchType: null - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: true hasGetter: true hasSetter: true @@ -77,7 +77,7 @@ KtFirKotlinPropertySymbol: name: p origin: SOURCE receiverType: null - setter: KtFirPropertySetterSymbol() + setter: KtPropertySetterSymbol() symbolKind: TOP_LEVEL visibility: Public deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/class.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/class.txt index 3d287a067c8..b4ff8159dc2 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/class.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/class.txt @@ -1,4 +1,4 @@ -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: A diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt index 0174f72220d..933d3f76bdf 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt @@ -1,10 +1,10 @@ -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] callableIdIfNonLocal: /A.i dispatchType: A - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: true hasGetter: true hasSetter: false @@ -29,12 +29,12 @@ KtFirKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: null -KtFirClassInitializerSymbol: +KtClassInitializerSymbol: origin: SOURCE symbolKind: CLASS_MEMBER deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: A diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt index e260f0a7f2d..497c8ecd664 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt @@ -1,10 +1,10 @@ -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] callableIdIfNonLocal: /A.a dispatchType: A - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: true hasGetter: true hasSetter: false @@ -29,7 +29,7 @@ KtFirKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -54,7 +54,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: A diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt index ac5360c3dca..c55b8872934 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt @@ -1,4 +1,4 @@ -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] A annotationClassIds: [] annotations: [] @@ -16,7 +16,7 @@ KtFirConstructorSymbol: visibility: Public deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: A diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt index 73a8b1cf6ab..c3a5d37a1ab 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt @@ -1,4 +1,4 @@ -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] A annotationClassIds: [] annotations: [] @@ -16,7 +16,7 @@ KtFirConstructorSymbol: visibility: Public deprecationStatus: null -KtFirValueParameterSymbol: +KtValueParameterSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -30,7 +30,7 @@ KtFirValueParameterSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] A annotationClassIds: [] annotations: [] @@ -45,12 +45,12 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(x) + KtValueParameterSymbol(x) ] visibility: Public deprecationStatus: null -KtFirValueParameterSymbol: +KtValueParameterSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -64,7 +64,7 @@ KtFirValueParameterSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirValueParameterSymbol: +KtValueParameterSymbol: annotatedType: [] kotlin/String annotationClassIds: [] annotations: [] @@ -78,7 +78,7 @@ KtFirValueParameterSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] A annotationClassIds: [] annotations: [] @@ -93,13 +93,13 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(y) - KtFirValueParameterSymbol(z) + KtValueParameterSymbol(y) + KtValueParameterSymbol(z) ] visibility: Public deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: A diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.txt index ed234334182..da22cec261f 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.txt @@ -1,4 +1,4 @@ -KtFirTypeParameterSymbol: +KtTypeParameterSymbol: isReified: false name: T origin: SOURCE @@ -8,7 +8,7 @@ KtFirTypeParameterSymbol: variance: INVARIANT deprecationStatus: null -KtFirTypeParameterSymbol: +KtTypeParameterSymbol: isReified: false name: R origin: SOURCE @@ -18,7 +18,7 @@ KtFirTypeParameterSymbol: variance: INVARIANT deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: A @@ -37,8 +37,8 @@ KtFirNamedClassOrObjectSymbol: ] symbolKind: TOP_LEVEL typeParameters: [ - KtFirTypeParameterSymbol(T) - KtFirTypeParameterSymbol(R) + KtTypeParameterSymbol(T) + KtTypeParameterSymbol(R) ] visibility: Public deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt index 1500e4c6213..63121e0f3e7 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt @@ -1,4 +1,4 @@ -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [ kotlin/Deprecated @@ -9,7 +9,7 @@ KtFirKotlinPropertySymbol: ] callableIdIfNonLocal: /i dispatchType: null - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: true hasGetter: true hasSetter: false @@ -34,13 +34,13 @@ KtFirKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i) -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] callableIdIfNonLocal: /i2 dispatchType: null - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: true hasGetter: true hasSetter: false @@ -65,13 +65,13 @@ KtFirKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: null -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] callableIdIfNonLocal: /i3 dispatchType: null - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: true hasGetter: true hasSetter: true @@ -87,7 +87,7 @@ KtFirKotlinPropertySymbol: name: i3 origin: SOURCE receiverType: null - setter: KtFirPropertySetterSymbol() + setter: KtPropertySetterSymbol() symbolKind: TOP_LEVEL visibility: Public deprecationStatus: null @@ -96,13 +96,13 @@ KtFirKotlinPropertySymbol: javaSetterName: setI3 setterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use getter of i3) -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] callableIdIfNonLocal: /i4 dispatchType: null - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: true hasGetter: true hasSetter: true @@ -118,7 +118,7 @@ KtFirKotlinPropertySymbol: name: i4 origin: SOURCE receiverType: null - setter: KtFirPropertySetterSymbol() + setter: KtPropertySetterSymbol() symbolKind: TOP_LEVEL visibility: Public deprecationStatus: null @@ -127,7 +127,7 @@ KtFirKotlinPropertySymbol: javaSetterName: setI4 setterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use getter of i4) -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [ kotlin/Deprecated @@ -157,7 +157,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use f) -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [ kotlin/Deprecated ] @@ -184,7 +184,7 @@ KtFirNamedClassOrObjectSymbol: visibility: Public deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use MyClass) -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [ kotlin/Deprecated @@ -195,7 +195,7 @@ KtFirKotlinPropertySymbol: ] callableIdIfNonLocal: /Foo.i2 dispatchType: Foo - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: true hasGetter: true hasSetter: false @@ -220,7 +220,7 @@ KtFirKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i2) -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [ kotlin/Deprecated @@ -250,7 +250,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use f2) -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: Foo @@ -272,7 +272,7 @@ KtFirNamedClassOrObjectSymbol: visibility: Public deprecationStatus: null -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [ kotlin/Deprecated @@ -283,7 +283,7 @@ KtFirKotlinPropertySymbol: ] callableIdIfNonLocal: /j dispatchType: null - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: true hasGetter: true hasSetter: false @@ -308,7 +308,7 @@ KtFirKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=ERROR, propagatesToOverrides=true, message=null) -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [ kotlin/Deprecated @@ -319,7 +319,7 @@ KtFirKotlinPropertySymbol: ] callableIdIfNonLocal: /j2 dispatchType: null - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: true hasGetter: true hasSetter: false @@ -344,7 +344,7 @@ KtFirKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=HIDDEN, propagatesToOverrides=true, message=null) -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [ java/lang/Deprecated @@ -355,7 +355,7 @@ KtFirKotlinPropertySymbol: ] callableIdIfNonLocal: /j2 dispatchType: null - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: true hasGetter: true hasSetter: false diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt index def43ea1be1..96dc826625c 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt @@ -1,4 +1,4 @@ -KtFirEnumEntrySymbol: +KtEnumEntrySymbol: annotatedType: [] X callableIdIfNonLocal: /X.Y containingEnumClassIdIfNonLocal: X @@ -9,7 +9,7 @@ KtFirEnumEntrySymbol: symbolKind: CLASS_MEMBER deprecationStatus: null -KtFirEnumEntrySymbol: +KtEnumEntrySymbol: annotatedType: [] X callableIdIfNonLocal: /X.Z containingEnumClassIdIfNonLocal: X @@ -20,7 +20,7 @@ KtFirEnumEntrySymbol: symbolKind: CLASS_MEMBER deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: X diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt index d14031c3cbb..69a9b6e828b 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt @@ -1,4 +1,4 @@ -KtFirValueParameterSymbol: +KtValueParameterSymbol: annotatedType: [] kotlin/String annotationClassIds: [] annotations: [] @@ -12,7 +12,7 @@ KtFirValueParameterSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] Style annotationClassIds: [] annotations: [] @@ -27,12 +27,12 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(value) + KtValueParameterSymbol(value) ] visibility: Private deprecationStatus: null -KtFirPropertyGetterSymbol: +KtPropertyGetterSymbol: annotatedType: [] kotlin/String annotationClassIds: [] annotations: [] @@ -52,13 +52,13 @@ KtFirPropertyGetterSymbol: visibility: Public deprecationStatus: null -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/String annotationClassIds: [] annotations: [] callableIdIfNonLocal: null dispatchType: - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: false hasGetter: true hasSetter: false @@ -83,7 +83,7 @@ KtFirKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: null -KtFirEnumEntrySymbol: +KtEnumEntrySymbol: annotatedType: [] Style callableIdIfNonLocal: /Style.SHEET containingEnumClassIdIfNonLocal: Style @@ -94,13 +94,13 @@ KtFirEnumEntrySymbol: symbolKind: CLASS_MEMBER deprecationStatus: null -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/String annotationClassIds: [] annotations: [] callableIdIfNonLocal: /Style.exitAnimation dispatchType: Style - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: false hasGetter: true hasSetter: false @@ -125,7 +125,7 @@ KtFirKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: Style diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.txt index 8ae6fc4405c..a37e334233f 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.txt @@ -1,4 +1,4 @@ -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.txt index 654dcb72fea..dbecca778c7 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.txt @@ -1,4 +1,4 @@ -KtFirLocalVariableSymbol: +KtLocalVariableSymbol: annotatedType: [] kotlin/Int callableIdIfNonLocal: null isExtension: false @@ -9,7 +9,7 @@ KtFirLocalVariableSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt index f4355c58198..2366e7a11f5 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt @@ -1,4 +1,4 @@ -KtFirValueParameterSymbol: +KtValueParameterSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -12,7 +12,7 @@ KtFirValueParameterSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] @@ -34,7 +34,7 @@ KtFirFunctionSymbol: symbolKind: TOP_LEVEL typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(x) + KtValueParameterSymbol(x) ] visibility: Public deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt index 88b993f8650..4199236885d 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt @@ -1,4 +1,4 @@ -KtFirTypeParameterSymbol: +KtTypeParameterSymbol: isReified: false name: X origin: SOURCE @@ -8,7 +8,7 @@ KtFirTypeParameterSymbol: variance: INVARIANT deprecationStatus: null -KtFirValueParameterSymbol: +KtValueParameterSymbol: annotatedType: [] X annotationClassIds: [] annotations: [] @@ -22,7 +22,7 @@ KtFirValueParameterSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] @@ -43,10 +43,10 @@ KtFirFunctionSymbol: receiverType: null symbolKind: TOP_LEVEL typeParameters: [ - KtFirTypeParameterSymbol(X) + KtTypeParameterSymbol(X) ] valueParameters: [ - KtFirValueParameterSymbol(x) + KtValueParameterSymbol(x) ] visibility: Public deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt index d9360587791..c34695b62d2 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt @@ -1,4 +1,4 @@ -KtFirValueParameterSymbol: +KtValueParameterSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -12,7 +12,7 @@ KtFirValueParameterSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] A annotationClassIds: [] annotations: [] @@ -27,12 +27,12 @@ KtFirConstructorSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(i) + KtValueParameterSymbol(i) ] visibility: Public deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: A diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturn.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturn.txt index 9c8d520054a..b18757af208 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturn.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturn.txt @@ -1,4 +1,4 @@ -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt index 4ecf5b79d12..6a1d70df74e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt @@ -1,4 +1,4 @@ -KtFirValueParameterSymbol: +KtValueParameterSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -12,7 +12,7 @@ KtFirValueParameterSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirLocalVariableSymbol: +KtLocalVariableSymbol: annotatedType: [] kotlin/Int callableIdIfNonLocal: null isExtension: false @@ -23,7 +23,7 @@ KtFirLocalVariableSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirAnonymousFunctionSymbol: +KtAnonymousFunctionSymbol: annotatedType: [] kotlin/Int callableIdIfNonLocal: null hasStableParameterNames: true @@ -32,11 +32,11 @@ KtFirAnonymousFunctionSymbol: receiverType: null symbolKind: LOCAL valueParameters: [ - KtFirValueParameterSymbol(a) + KtValueParameterSymbol(a) ] deprecationStatus: null -KtFirLocalVariableSymbol: +KtLocalVariableSymbol: annotatedType: [] kotlin/Function1 callableIdIfNonLocal: null isExtension: false @@ -47,7 +47,7 @@ KtFirLocalVariableSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirValueParameterSymbol: +KtValueParameterSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -61,7 +61,7 @@ KtFirValueParameterSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirLocalVariableSymbol: +KtLocalVariableSymbol: annotatedType: [] kotlin/Int callableIdIfNonLocal: null isExtension: false @@ -72,7 +72,7 @@ KtFirLocalVariableSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirAnonymousFunctionSymbol: +KtAnonymousFunctionSymbol: annotatedType: [] kotlin/Int callableIdIfNonLocal: null hasStableParameterNames: true @@ -81,11 +81,11 @@ KtFirAnonymousFunctionSymbol: receiverType: null symbolKind: LOCAL valueParameters: [ - KtFirValueParameterSymbol(a) + KtValueParameterSymbol(a) ] deprecationStatus: null -KtFirLocalVariableSymbol: +KtLocalVariableSymbol: annotatedType: [] kotlin/Function1 callableIdIfNonLocal: null isExtension: false @@ -96,7 +96,7 @@ KtFirLocalVariableSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirLocalVariableSymbol: +KtLocalVariableSymbol: annotatedType: [] kotlin/Int callableIdIfNonLocal: null isExtension: false @@ -107,7 +107,7 @@ KtFirLocalVariableSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirAnonymousFunctionSymbol: +KtAnonymousFunctionSymbol: annotatedType: [] kotlin/Int callableIdIfNonLocal: null hasStableParameterNames: true @@ -116,11 +116,11 @@ KtFirAnonymousFunctionSymbol: receiverType: null symbolKind: LOCAL valueParameters: [ - KtFirValueParameterSymbol(it) + KtValueParameterSymbol(it) ] deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] @@ -145,7 +145,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirValueParameterSymbol: +KtValueParameterSymbol: annotatedType: [] kotlin/Function1 annotationClassIds: [] annotations: [] @@ -159,7 +159,7 @@ KtFirValueParameterSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] @@ -181,7 +181,7 @@ KtFirFunctionSymbol: symbolKind: TOP_LEVEL typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(lmbd) + KtValueParameterSymbol(lmbd) ] visibility: Private deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt index 4b11fa10422..7cc3eeca160 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt @@ -1,10 +1,10 @@ -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] callableIdIfNonLocal: /Foo.i dispatchType: Foo - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: true hasGetter: true hasSetter: true @@ -20,7 +20,7 @@ KtFirKotlinPropertySymbol: name: i origin: SOURCE receiverType: null - setter: KtFirPropertySetterSymbol() + setter: KtPropertySetterSymbol() symbolKind: CLASS_MEMBER visibility: Public deprecationStatus: null @@ -29,7 +29,7 @@ KtFirKotlinPropertySymbol: javaSetterName: setMyI setterDeprecationStatus: null -KtFirPropertyGetterSymbol: +KtPropertyGetterSymbol: annotatedType: [] kotlin/Int annotationClassIds: [ kotlin/jvm/JvmName @@ -54,7 +54,7 @@ KtFirPropertyGetterSymbol: visibility: Public deprecationStatus: null -KtFirValueParameterSymbol: +KtValueParameterSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -68,7 +68,7 @@ KtFirValueParameterSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirPropertySetterSymbol: +KtPropertySetterSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [ kotlin/jvm/JvmName @@ -87,22 +87,22 @@ KtFirPropertySetterSymbol: isOverride: false modality: FINAL origin: SOURCE - parameter: KtFirValueParameterSymbol(value) + parameter: KtValueParameterSymbol(value) receiverType: null symbolKind: ACCESSOR valueParameters: [ - KtFirValueParameterSymbol(value) + KtValueParameterSymbol(value) ] visibility: Public deprecationStatus: null -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] callableIdIfNonLocal: /Foo.j dispatchType: Foo - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: false hasGetter: true hasSetter: true @@ -118,7 +118,7 @@ KtFirKotlinPropertySymbol: name: j origin: SOURCE receiverType: null - setter: KtFirPropertySetterSymbol() + setter: KtPropertySetterSymbol() symbolKind: CLASS_MEMBER visibility: Public deprecationStatus: null @@ -127,7 +127,7 @@ KtFirKotlinPropertySymbol: javaSetterName: setMyJ setterDeprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: Foo diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt index 8ec3129d620..4292798b5e8 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt @@ -1,4 +1,4 @@ -KtFirLocalVariableSymbol: +KtLocalVariableSymbol: annotatedType: [] kotlin/Int callableIdIfNonLocal: null isExtension: false @@ -9,7 +9,7 @@ KtFirLocalVariableSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] @@ -34,7 +34,7 @@ KtFirFunctionSymbol: visibility: Local deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: null @@ -56,7 +56,7 @@ KtFirNamedClassOrObjectSymbol: visibility: Local deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt index 29743cf44bd..be8da2cadca 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt @@ -1,4 +1,4 @@ -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -23,7 +23,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] @@ -48,7 +48,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: A diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt index b3fe029da24..c8ee86eaaaa 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt @@ -1,10 +1,10 @@ -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] callableIdIfNonLocal: /A.x dispatchType: A - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: true hasGetter: true hasSetter: false @@ -29,7 +29,7 @@ KtFirKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: null -KtFirPropertyGetterSymbol: +KtPropertyGetterSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -49,13 +49,13 @@ KtFirPropertyGetterSymbol: visibility: Public deprecationStatus: null -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] callableIdIfNonLocal: /A.y dispatchType: A - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: false hasGetter: true hasSetter: false @@ -80,7 +80,7 @@ KtFirKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: A diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt index 76fa8768b52..167adca0595 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt @@ -1,4 +1,4 @@ -KtFirTypeParameterSymbol: +KtTypeParameterSymbol: isReified: false name: T origin: SOURCE @@ -8,7 +8,7 @@ KtFirTypeParameterSymbol: variance: INVARIANT deprecationStatus: null -KtFirTypeParameterSymbol: +KtTypeParameterSymbol: isReified: false name: T1 origin: SOURCE @@ -18,7 +18,7 @@ KtFirTypeParameterSymbol: variance: INVARIANT deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: X.Y @@ -37,12 +37,12 @@ KtFirNamedClassOrObjectSymbol: ] symbolKind: CLASS_MEMBER typeParameters: [ - KtFirTypeParameterSymbol(T1) + KtTypeParameterSymbol(T1) ] visibility: Public deprecationStatus: null -KtFirTypeParameterSymbol: +KtTypeParameterSymbol: isReified: false name: T2 origin: SOURCE @@ -52,7 +52,7 @@ KtFirTypeParameterSymbol: variance: INVARIANT deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: X.Z @@ -71,12 +71,12 @@ KtFirNamedClassOrObjectSymbol: ] symbolKind: CLASS_MEMBER typeParameters: [ - KtFirTypeParameterSymbol(T2) + KtTypeParameterSymbol(T2) ] visibility: Public deprecationStatus: null -KtFirTypeParameterSymbol: +KtTypeParameterSymbol: isReified: false name: T3 origin: SOURCE @@ -86,7 +86,7 @@ KtFirTypeParameterSymbol: variance: INVARIANT deprecationStatus: null -KtFirTypeParameterSymbol: +KtTypeParameterSymbol: isReified: false name: T4 origin: SOURCE @@ -96,7 +96,7 @@ KtFirTypeParameterSymbol: variance: INVARIANT deprecationStatus: null -KtFirTypeParameterSymbol: +KtTypeParameterSymbol: isReified: false name: T5 origin: SOURCE @@ -106,7 +106,7 @@ KtFirTypeParameterSymbol: variance: INVARIANT deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: null @@ -125,12 +125,12 @@ KtFirNamedClassOrObjectSymbol: ] symbolKind: LOCAL typeParameters: [ - KtFirTypeParameterSymbol(T5) + KtTypeParameterSymbol(T5) ] visibility: Local deprecationStatus: null -KtFirTypeParameterSymbol: +KtTypeParameterSymbol: isReified: false name: T6 origin: SOURCE @@ -140,7 +140,7 @@ KtFirTypeParameterSymbol: variance: INVARIANT deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: null @@ -159,12 +159,12 @@ KtFirNamedClassOrObjectSymbol: ] symbolKind: LOCAL typeParameters: [ - KtFirTypeParameterSymbol(T6) + KtTypeParameterSymbol(T6) ] visibility: Local deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: null @@ -183,12 +183,12 @@ KtFirNamedClassOrObjectSymbol: ] symbolKind: LOCAL typeParameters: [ - KtFirTypeParameterSymbol(T4) + KtTypeParameterSymbol(T4) ] visibility: Local deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] @@ -209,13 +209,13 @@ KtFirFunctionSymbol: receiverType: null symbolKind: CLASS_MEMBER typeParameters: [ - KtFirTypeParameterSymbol(T3) + KtTypeParameterSymbol(T3) ] valueParameters: [] visibility: Public deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: X @@ -234,7 +234,7 @@ KtFirNamedClassOrObjectSymbol: ] symbolKind: TOP_LEVEL typeParameters: [ - KtFirTypeParameterSymbol(T) + KtTypeParameterSymbol(T) ] visibility: Public deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.txt index e65f9941fbe..56d5fb05cf8 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.txt @@ -1,4 +1,4 @@ -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -23,7 +23,7 @@ KtFirFunctionSymbol: visibility: Public deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt index 455e6593806..9efb0f9ec1a 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt @@ -1,10 +1,10 @@ -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] callableIdIfNonLocal: /x dispatchType: null - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: true hasGetter: true hasSetter: false @@ -29,7 +29,7 @@ KtFirKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: null -KtFirPropertyGetterSymbol: +KtPropertyGetterSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -49,13 +49,13 @@ KtFirPropertyGetterSymbol: visibility: Public deprecationStatus: null -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] callableIdIfNonLocal: /y dispatchType: null - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: false hasGetter: true hasSetter: false diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAlias.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAlias.txt index 71d405acf4d..8da5124a863 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAlias.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAlias.txt @@ -1,4 +1,4 @@ -KtFirTypeParameterSymbol: +KtTypeParameterSymbol: isReified: false name: T origin: SOURCE @@ -8,7 +8,7 @@ KtFirTypeParameterSymbol: variance: INVARIANT deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: X @@ -27,12 +27,12 @@ KtFirNamedClassOrObjectSymbol: ] symbolKind: TOP_LEVEL typeParameters: [ - KtFirTypeParameterSymbol(T) + KtTypeParameterSymbol(T) ] visibility: Public deprecationStatus: null -KtFirTypeParameterSymbol: +KtTypeParameterSymbol: isReified: false name: Z origin: SOURCE @@ -42,14 +42,14 @@ KtFirTypeParameterSymbol: variance: INVARIANT deprecationStatus: null -KtFirTypeAliasSymbol: +KtTypeAliasSymbol: classIdIfNonLocal: Y expandedType: X name: Y origin: SOURCE symbolKind: TOP_LEVEL typeParameters: [ - KtFirTypeParameterSymbol(Z) + KtTypeParameterSymbol(Z) ] visibility: Private deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt index db58b2c528a..da307a8428b 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt @@ -1,4 +1,4 @@ -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [ kotlin/annotation/Target ] @@ -25,7 +25,7 @@ KtFirNamedClassOrObjectSymbol: visibility: Public deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [ kotlin/annotation/Target ] @@ -52,7 +52,7 @@ KtFirNamedClassOrObjectSymbol: visibility: Public deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [ kotlin/annotation/Target ] @@ -79,7 +79,7 @@ KtFirNamedClassOrObjectSymbol: visibility: Public deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [ kotlin/annotation/Target ] @@ -106,7 +106,7 @@ KtFirNamedClassOrObjectSymbol: visibility: Public deprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: I @@ -128,7 +128,7 @@ KtFirNamedClassOrObjectSymbol: visibility: Public deprecationStatus: null -KtFirValueParameterSymbol: +KtValueParameterSymbol: annotatedType: [ Anno2() psi: KtAnnotationEntry @@ -145,7 +145,7 @@ KtFirValueParameterSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [ Anno3() psi: KtAnnotationEntry @@ -170,12 +170,12 @@ KtFirFunctionSymbol: symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(arg) + KtValueParameterSymbol(arg) ] visibility: Public deprecationStatus: null -KtFirKotlinPropertySymbol: +KtKotlinPropertySymbol: annotatedType: [ Anno4() psi: KtAnnotationEntry @@ -184,7 +184,7 @@ KtFirKotlinPropertySymbol: annotations: [] callableIdIfNonLocal: /X.x dispatchType: X - getter: KtFirPropertyGetterSymbol() + getter: KtPropertyGetterSymbol() hasBackingField: true hasGetter: true hasSetter: false @@ -209,7 +209,7 @@ KtFirKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: null -KtFirNamedClassOrObjectSymbol: +KtNamedClassOrObjectSymbol: annotationClassIds: [] annotations: [] classIdIfNonLocal: X diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt index 2ca4d1b9f7f..8b1ed3f5282 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt @@ -1,4 +1,4 @@ -KtFirValueParameterSymbol: +KtValueParameterSymbol: annotatedType: [] kotlin/Int annotationClassIds: [] annotations: [] @@ -12,7 +12,7 @@ KtFirValueParameterSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] @@ -34,12 +34,12 @@ KtFirFunctionSymbol: symbolKind: TOP_LEVEL typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(a) + KtValueParameterSymbol(a) ] visibility: Public deprecationStatus: null -KtFirValueParameterSymbol: +KtValueParameterSymbol: annotatedType: [] kotlin/Float? annotationClassIds: [] annotations: [] @@ -53,7 +53,7 @@ KtFirValueParameterSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] @@ -75,12 +75,12 @@ KtFirFunctionSymbol: symbolKind: TOP_LEVEL typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(b) + KtValueParameterSymbol(b) ] visibility: Public deprecationStatus: null -KtFirValueParameterSymbol: +KtValueParameterSymbol: annotatedType: [] kotlin/Any annotationClassIds: [] annotations: [] @@ -94,7 +94,7 @@ KtFirValueParameterSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] @@ -116,12 +116,12 @@ KtFirFunctionSymbol: symbolKind: TOP_LEVEL typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(c) + KtValueParameterSymbol(c) ] visibility: Public deprecationStatus: null -KtFirValueParameterSymbol: +KtValueParameterSymbol: annotatedType: [] ERROR CLASS: Symbol not found for Unresolved annotationClassIds: [] annotations: [] @@ -135,7 +135,7 @@ KtFirValueParameterSymbol: symbolKind: LOCAL deprecationStatus: null -KtFirFunctionSymbol: +KtFunctionSymbol: annotatedType: [] kotlin/Unit annotationClassIds: [] annotations: [] @@ -157,7 +157,7 @@ KtFirFunctionSymbol: symbolKind: TOP_LEVEL typeParameters: [] valueParameters: [ - KtFirValueParameterSymbol(d) + KtValueParameterSymbol(d) ] visibility: Public deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt b/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt index ed968d31b55..61e64872160 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt @@ -1,10 +1,10 @@ -KtFirBackingFieldSymbol: +KtBackingFieldSymbol: annotatedType: [] kotlin/Int callableIdIfNonLocal: null isExtension: false name: field origin: PROPERTY_BACKING_FIELD - owningProperty: KtFirKotlinPropertySymbol(x) + owningProperty: KtKotlinPropertySymbol(x) receiverType: null symbolKind: LOCAL deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.txt b/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.txt index 443dd363322..c811ccbfe39 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.txt @@ -1,4 +1,4 @@ -KtFirConstructorSymbol: +KtConstructorSymbol: annotatedType: [] java/util/ArrayList annotationClassIds: [] annotations: [] @@ -12,10 +12,10 @@ KtFirConstructorSymbol: receiverType: null symbolKind: CLASS_MEMBER typeParameters: [ - KtFirTypeParameterSymbol(E) + KtTypeParameterSymbol(E) ] valueParameters: [ - KtFirValueParameterSymbol(p0) + KtValueParameterSymbol(p0) ] visibility: Public deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.txt b/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.txt index aefc917de6a..3eb6302282e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.txt @@ -1,4 +1,4 @@ -KtFirSamConstructorSymbol: +KtSamConstructorSymbol: annotatedType: [] java/lang/Runnable callableIdIfNonLocal: java/lang/Runnable hasStableParameterNames: true @@ -8,6 +8,6 @@ KtFirSamConstructorSymbol: receiverType: null symbolKind: SAM_CONSTRUCTOR valueParameters: [ - KtFirValueParameterSymbol(function) + KtValueParameterSymbol(function) ] deprecationStatus: null